fix: eslint

teleskop150750 · teleskop150750 · commit 505078e8ba45 · 2024-08-21T10:05:30.000+03:00
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,18 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 2
+indent_style = space
+insert_final_newline = true
+max_line_length = 120
+tab_width = 2
+trim_trailing_whitespace = true
+
+[Makefile]
+indent_style = tab
+tab_width = 4
+
+[{*.md,*.mdx}]
+trim_trailing_whitespace = false
diff --git a/packages/vue-primitives/src/accordion/Accordion.vue b/packages/vue-primitives/src/accordion/Accordion.vue
@@ -35,7 +35,8 @@ const TYPE_SINGLE = 'single' as const satisfies AccordionType
 const collectionContext = Collection.provideCollectionContext($el)
 const getItems = useCollection(collectionContext)
 const handleKeydown = composeEventHandlers<KeyboardEvent>((event) => {
-  isFunction(attrs.onKeydown) && attrs.onKeydown(event)
+  if (isFunction(attrs.onKeydown))
+    attrs.onKeydown(event)
 }, (event) => {
   if (!ACCORDION_KEYS.includes(event.key))
     return
diff --git a/packages/vue-primitives/src/checkbox/Checkbox.vue b/packages/vue-primitives/src/checkbox/Checkbox.vue
@@ -44,7 +44,8 @@ watchEffect((onCleanup) => {
 })
 
 const onKeydown = composeEventHandlers<KeyboardEvent>((event) => {
-  isFunction(attrs.onKeydown) && attrs.onKeydown(event)
+  if (isFunction(attrs.onKeydown))
+    attrs.onKeydown(event)
 }, (event) => {
   // According to WAI ARIA, Checkboxes don't activate on enter keypress
   if (event.key === 'Enter')
@@ -63,7 +64,8 @@ const onClick = composeEventHandlers<CliclEvent>((event) => {
     return this._isPropagationStopped
   }
 
-  isFunction(attrs.onClick) && attrs.onClick(event)
+  if (isFunction(attrs.onClick))
+    attrs.onClick(event)
 }, (event) => {
   checked.value = isIndeterminate(checked.value) ? true : !checked.value
   if (isFormControl.value) {
diff --git a/packages/vue-primitives/src/collapsible/CollapsibleTrigger.vue b/packages/vue-primitives/src/collapsible/CollapsibleTrigger.vue
@@ -20,7 +20,8 @@ const attrs = useAttrs()
 const context = useCollapsibleContext()
 
 const onClick = composeEventHandlers((event) => {
-  isFunction(attrs.onClick) && attrs.onClick(event)
+  if (isFunction(attrs.onClick))
+    attrs.onClick(event)
 }, context.onOpenToggle)
 </script>
 
diff --git a/packages/vue-primitives/src/radio-group/Radio.vue b/packages/vue-primitives/src/radio-group/Radio.vue
@@ -37,7 +37,8 @@ const onClick = composeEventHandlers<CliclEvent>((event) => {
     return this._isPropagationStopped
   }
 
-  isFunction(attrs.onClick) && attrs.onClick(event)
+  if (isFunction(attrs.onClick))
+    attrs.onClick(event)
 }, (event) => {
   // radios cannot be unchecked so we only communicate a checked state
   if (!props.checked)
diff --git a/packages/vue-primitives/src/radio-group/RadioGroupItem.vue b/packages/vue-primitives/src/radio-group/RadioGroupItem.vue
@@ -55,7 +55,8 @@ function onKeyDown(event: KeyboardEvent) {
 }
 
 const onFocus = composeEventHandlers<FocusEvent>((event) => {
-  isFunction(attrs.onFocus) && attrs.onFocus(event)
+  if (isFunction(attrs.onFocus))
+    attrs.onFocus(event)
 }, () => {
   /**
    * Our `RovingFocusGroup` will focus the radio when navigating with arrow keys
diff --git a/packages/vue-primitives/src/roving-focus/RovingFocusGroup.vue b/packages/vue-primitives/src/roving-focus/RovingFocusGroup.vue
@@ -31,13 +31,15 @@ let isClickFocus = false
 const focusableItemsCount = shallowRef(0)
 
 const onMousedown = composeEventHandlers((event) => {
-  isFunction(attrs.onMousedown) && attrs.onMousedown(event)
+  if (isFunction(attrs.onMousedown))
+    attrs.onMousedown(event)
 }, () => {
   isClickFocus = true
 })
 
 const onFocus = composeEventHandlers((event) => {
-  isFunction(attrs.onFocus) && attrs.onFocus(event)
+  if (isFunction(attrs.onFocus))
+    attrs.onFocus(event)
 }, (event) => {
   // We normally wouldn't need this check, because we already check
   // that the focus is on the current target and not bubbling to it.
@@ -65,7 +67,8 @@ const onFocus = composeEventHandlers((event) => {
 })
 
 const onFocusout = composeEventHandlers((event) => {
-  isFunction(attrs.onFocusout) && attrs.onFocusout(event)
+  if (isFunction(attrs.onFocusout))
+    attrs.onFocusout(event)
 }, () => {
   isTabbingBackOut.value = false
 })
diff --git a/packages/vue-primitives/src/roving-focus/RovingFocusGroupItem.vue b/packages/vue-primitives/src/roving-focus/RovingFocusGroupItem.vue
@@ -47,7 +47,8 @@ watchEffect(() => {
 Collection.useCollectionItem($el, itemData)
 
 const onMousedown = composeEventHandlers((event) => {
-  isFunction(attrs.onMousedown) && attrs.onMousedown(event)
+  if (isFunction(attrs.onMousedown))
+    attrs.onMousedown(event)
 }, (event) => {
   // We prevent focusing non-focusable items on `mousedown`.
   // Even though the item has tabIndex={-1}, that only means take it out of the tab order.
@@ -58,11 +59,13 @@ const onMousedown = composeEventHandlers((event) => {
 })
 
 const onFocus = composeEventHandlers((event) => {
-  isFunction(attrs.onFocus) && attrs.onFocus(event)
+  if (isFunction(attrs.onFocus))
+    attrs.onFocus(event)
 }, () => context.onItemFocus(id.value))
 
 const onKeydown = composeEventHandlers<KeyboardEvent>((event) => {
-  isFunction(attrs.onKeydown) && attrs.onKeydown(event)
+  if (isFunction(attrs.onKeydown))
+    attrs.onKeydown(event)
 }, (event) => {
   if (event.key === 'Tab' && event.shiftKey) {
     context.onItemShiftTab()
diff --git a/packages/vue-primitives/src/roving-focus/stories/Button.vue b/packages/vue-primitives/src/roving-focus/stories/Button.vue
@@ -20,7 +20,8 @@ const isSelected = computed(() => context.value.value !== undefined
   && context.value.value === props.value)
 
 const onFocus = composeEventHandlers((event) => {
-  isFunction(attrs.onFocus) && attrs.onFocus(event)
+  if (isFunction(attrs.onFocus))
+    attrs.onFocus(event)
 }, (event) => {
   if (context.value.value !== undefined) {
     (event.target as HTMLElement).click()
diff --git a/packages/vue-primitives/src/scroll-area/ScrollAreaScrollbarScroll.vue b/packages/vue-primitives/src/scroll-area/ScrollAreaScrollbarScroll.vue
@@ -88,13 +88,15 @@ watchEffect((onCleanup) => {
 const isPresent = usePresence($el, () => props.forceMount || state.value !== 'hidden')
 
 const onPointerenter = composeEventHandlers<PointerEvent>((event) => {
-  isFunction(attrs.onPointerenter) && attrs.onPointerenter(event)
+  if (isFunction(attrs.onPointerenter))
+    attrs.onPointerenter(event)
 }, () => {
   send('POINTER_ENTER')
 })
 
 const onPointerleave = composeEventHandlers<PointerEvent>((event) => {
-  isFunction(attrs.onPointerleave) && attrs.onPointerleave(event)
+  if (isFunction(attrs.onPointerleave))
+    attrs.onPointerleave(event)
 }, () => {
   send('POINTER_LEAVE')
 })
diff --git a/packages/vue-primitives/src/scroll-area/ScrollAreaScrollbarVisible.vue b/packages/vue-primitives/src/scroll-area/ScrollAreaScrollbarVisible.vue
@@ -80,7 +80,8 @@ function handleDragScroll(event: PointerEvent) {
 }
 
 const onPointerdown = composeEventHandlers<PointerEvent>((event) => {
-  isFunction(attrs.onPointerdown) && attrs.onPointerdown(event)
+  if (isFunction(attrs.onPointerdown))
+    attrs.onPointerdown(event)
 }, (event) => {
   const mainPointer = 0
   if (event.button !== mainPointer)
@@ -101,13 +102,15 @@ const onPointerdown = composeEventHandlers<PointerEvent>((event) => {
 })
 
 const onPointermove = composeEventHandlers<PointerEvent>((event) => {
-  isFunction(attrs.onPointermown) && attrs.onPointermown(event)
+  if (isFunction(attrs.onPointermown))
+    attrs.onPointermown(event)
 }, (event: PointerEvent) => {
   handleDragScroll(event)
 })
 
 const onPointerup = composeEventHandlers<PointerEvent>((event) => {
-  isFunction(attrs.onPointerup) && attrs.onPointerup(event)
+  if (isFunction(attrs.onPointerup))
+    attrs.onPointerup(event)
 }, (event: PointerEvent) => {
   const element = event.target as HTMLElement
   if (element.hasPointerCapture(event.pointerId))
diff --git a/packages/vue-primitives/src/scroll-area/ScrollAreaThumb.vue b/packages/vue-primitives/src/scroll-area/ScrollAreaThumb.vue
@@ -64,7 +64,8 @@ watchEffect((onCleanup) => {
 })
 
 const onPointerdownCapture = composeEventHandlers<PointerEvent>((event) => {
-  isFunction(attrs.onPointerdownCapture) && attrs.onPointerdownCapture(event)
+  if (isFunction(attrs.onPointerdownCapture))
+    attrs.onPointerdownCapture(event)
 }, (event) => {
   const thumb = event.target as HTMLElement
   const thumbRect = thumb.getBoundingClientRect()
@@ -74,7 +75,8 @@ const onPointerdownCapture = composeEventHandlers<PointerEvent>((event) => {
 })
 
 const onPointerup = composeEventHandlers<PointerEvent>((event) => {
-  isFunction(attrs.onPointerup) && attrs.onPointerup(event)
+  if (isFunction(attrs.onPointerup))
+    attrs.onPointerup(event)
 }, scrollbarContext.onThumbPointerUp)
 
 const isPresent = usePresence(scrollbarContext.thumb, () => props.forceMount || scrollbarContext.hasThumb.value)
diff --git a/packages/vue-primitives/src/slider/Slider.vue b/packages/vue-primitives/src/slider/Slider.vue
@@ -289,7 +289,8 @@ provideSliderOrientationContext(orientationContext)
 // SliderImpl
 
 const onKeydown = composeEventHandlers<KeyboardEvent>((event) => {
-  isFunction(attrs.onKeydown) && attrs.onKeydown(event)
+  if (isFunction(attrs.onKeydown))
+    attrs.onKeydown(event)
 }, (event) => {
   if (event.key === 'Home') {
     onSliderHomeKeyDown()
@@ -309,7 +310,8 @@ const onKeydown = composeEventHandlers<KeyboardEvent>((event) => {
 })
 
 const onPointerdown = composeEventHandlers<PointerEvent>((event) => {
-  isFunction(attrs.onPointerdown) && attrs.onPointerdown(event)
+  if (isFunction(attrs.onPointerdown))
+    attrs.onPointerdown(event)
 }, (event) => {
   onSliderPointerdown()
 
@@ -328,15 +330,17 @@ const onPointerdown = composeEventHandlers<PointerEvent>((event) => {
 })
 
 const onPointermove = composeEventHandlers<PointerEvent>((event) => {
-  isFunction(attrs.onPointermove) && attrs.onPointermove(event)
+  if (isFunction(attrs.onPointermove))
+    attrs.onPointermove(event)
 }, (event) => {
   const target = event.target as HTMLElement
   if (target.hasPointerCapture(event.pointerId))
     onOrientationSlideMove(event)
 })
 
 const onPointerup = composeEventHandlers<PointerEvent>((event) => {
-  isFunction(attrs.onPointerup) && attrs.onPointerup(event)
+  if (isFunction(attrs.onPointerup))
+    attrs.onPointerup(event)
 }, (event) => {
   const target = event.target as HTMLElement
   if (target.hasPointerCapture(event.pointerId)) {
diff --git a/packages/vue-primitives/src/slider/SliderThumb.vue b/packages/vue-primitives/src/slider/SliderThumb.vue
@@ -47,16 +47,19 @@ const thumbInBoundsOffset = computed(() => {
   return orientationSize ? getThumbInBoundsOffset(orientationSize, percent.value, orientation.value.direction) : 0
 })
 
-isClient && watchEffect((onCleanup) => {
-  const thumb = $el.value
-  if (thumb) {
-    context.thumbs.add(thumb)
-    onCleanup(() => context.thumbs.delete(thumb))
-  }
-})
+if (isClient) {
+  watchEffect((onCleanup) => {
+    const thumb = $el.value
+    if (thumb) {
+      context.thumbs.add(thumb)
+      onCleanup(() => context.thumbs.delete(thumb))
+    }
+  })
+}
 
 const onFocus = composeEventHandlers((event) => {
-  isFunction(attrs.onFocus) && attrs.onFocus(event)
+  if (isFunction(attrs.onFocus))
+    attrs.onFocus(event)
 }, () => {
   context.valueIndexToChangeRef.value = index.value
 })
@@ -107,7 +110,7 @@ defineExpose({
     <BubbleInput
       v-if="isFormControl"
       :key="index"
-      :name=" name ?? (context.name() ? context.name() + (context.values.value.length > 1 ? '[]' : '') : undefined)"
+      :name="name ?? (context.name() ? context.name() + (context.values.value.length > 1 ? '[]' : '') : undefined)"
       :value="value"
     />
   </span>
diff --git a/packages/vue-primitives/src/switch/Switch.vue b/packages/vue-primitives/src/switch/Switch.vue
@@ -48,7 +48,9 @@ const onClick = composeEventHandlers<CliclEvent>((event) => {
   event.isPropagationStopped = function isPropagationStopped() {
     return this._isPropagationStopped
   }
-  isFunction(attrs.onClick) && attrs.onClick(event)
+
+  if (isFunction(attrs.onClick))
+    attrs.onClick(event)
 }, (event) => {
   checked.value = !checked.value
 
diff --git a/packages/vue-primitives/src/tabs/TabsTrigger.vue b/packages/vue-primitives/src/tabs/TabsTrigger.vue
@@ -2,9 +2,8 @@
 import { computed, shallowRef, useAttrs } from 'vue'
 import { Primitive } from '../primitive/index.ts'
 import { RovingFocusGroupItem } from '../roving-focus/index.ts'
-import { composeEventHandlers } from '../utils/vue.ts'
+import { composeEventHandlers, forwardRef } from '../utils/vue.ts'
 import { isFunction, isPropFalsy } from '../utils/is.ts'
-import { forwardRef } from '../utils/vue.ts'
 import { useTabsContext } from './Tabs.ts'
 import { makeContentId, makeTriggerId } from './utils.ts'
 import type { TabsTriggerProps } from './TabsTrigger.ts'
@@ -27,7 +26,8 @@ const contentId = computed(() => makeContentId(context.baseId, props.value))
 const isSelected = computed(() => context.value.value === props.value)
 
 const onMousedown = composeEventHandlers<MouseEvent>((event) => {
-  isFunction(attrs.onMousedown) && attrs.onMousedown(event)
+  if (isFunction(attrs.onMousedown))
+    attrs.onMousedown(event)
 }, (event) => {
   // only call handler if it's the left button (mousedown gets triggered by all mouse buttons)
   // but not when the control key is pressed (avoiding MacOS right click)
@@ -41,14 +41,16 @@ const onMousedown = composeEventHandlers<MouseEvent>((event) => {
 })
 
 const onKeydown = composeEventHandlers<KeyboardEvent>((event) => {
-  isFunction(attrs.onKeydown) && attrs.onKeydown(event)
+  if (isFunction(attrs.onKeydown))
+    attrs.onKeydown(event)
 }, (event) => {
   if ([' ', 'Enter'].includes(event.key))
     context.onValueChange(props.value)
 })
 
 const onFocus = composeEventHandlers<FocusEvent>((event) => {
-  isFunction(attrs.onFocus) && attrs.onFocus(event)
+  if (isFunction(attrs.onFocus))
+    attrs.onFocus(event)
 }, () => {
   // handle "automatic" activation if necessary
   // ie. activate tab following focus
diff --git a/packages/vue-primitives/src/toggle/Toggle.vue b/packages/vue-primitives/src/toggle/Toggle.vue
@@ -21,7 +21,8 @@ const attrs = useAttrs()
 const pressed = useControllableState(props, v => emit('update:pressed', v), 'pressed', props.defaultPressed)
 
 const onClick = composeEventHandlers((event: Event) => {
-  isFunction(attrs.onClick) && attrs.onClick(event)
+  if (isFunction(attrs.onClick))
+    attrs.onClick(event)
 }, () => {
   if (isPropFalsy(attrs.disabled))
     pressed.value = !pressed.value
diff --git a/packages/vue-primitives/src/toolbar/ToolbarLink.vue b/packages/vue-primitives/src/toolbar/ToolbarLink.vue
@@ -17,7 +17,8 @@ withDefaults(defineProps<ToolbarLinkProps>(), {
 const attrs = useAttrs()
 
 const onKeydown = composeEventHandlers((event) => {
-  isFunction(attrs.onKeydown) && attrs.onKeydown(event)
+  if (isFunction(attrs.onKeydown))
+    attrs.onKeydown(event)
 }, (event: KeyboardEvent) => {
   if (event.key === ' ') {
     (event.currentTarget as HTMLElement).click()
diff --git a/packages/vue-primitives/src/utils/vue.ts b/packages/vue-primitives/src/utils/vue.ts
@@ -4,9 +4,6 @@ export function forwardRef<T = HTMLElement>(elRef: Ref<T>) {
   function setRef(nodeRef: any) {
     const node = nodeRef?.$el
 
-    if (elRef.value === node)
-      return
-
     elRef.value = node
   }
 

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,8 @@ const onClick = composeEventHandlers<CliclEvent>((event) => {`
`37`	`37`	`return this._isPropagationStopped`
`38`	`38`	`}`
`39`	`39`
`40`		`- isFunction(attrs.onClick) && attrs.onClick(event)`
	`40`	`+ if (isFunction(attrs.onClick))`
	`41`	`+ attrs.onClick(event)`
`41`	`42`	`}, (event) => {`
`42`	`43`	`// radios cannot be unchecked so we only communicate a checked state`
`43`	`44`	`if (!props.checked)`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,8 @@ function onKeyDown(event: KeyboardEvent) {`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`const onFocus = composeEventHandlers<FocusEvent>((event) => {`
`58`		`- isFunction(attrs.onFocus) && attrs.onFocus(event)`
	`58`	`+ if (isFunction(attrs.onFocus))`
	`59`	`+ attrs.onFocus(event)`
`59`	`60`	`}, () => {`
`60`	`61`	`/**`
`61`	`62`	* Our `RovingFocusGroup` will focus the radio when navigating with arrow keys