From d8573be3a47b90c24904e6aa97faa36b5238b81b Mon Sep 17 00:00:00 2001 From: productdevbook Date: Wed, 2 Aug 2023 13:34:52 +0300 Subject: [PATCH] refaktor(core): name change --- packages/components/checkbox/src/checkbox.ts | 4 ++-- .../components/collapsible/src/collapsibleContentImpl.ts | 4 ++-- packages/components/popper/src/popperAnchor.ts | 4 ++-- packages/components/popper/src/popperContent.ts | 4 ++-- packages/components/slot/src/slot.ts | 4 ++-- packages/components/switch/src/Switch.ts | 4 ++-- packages/core/use-composable/src/index.ts | 2 +- .../src/{useComposeRefs.ts => useComposedRefs.ts} | 2 +- packages/core/use-composable/tests/useComposeRefs.test.ts | 6 +++--- packages/core/use-composable/tests/useForwardRef.ts | 6 +++--- 10 files changed, 20 insertions(+), 20 deletions(-) rename packages/core/use-composable/src/{useComposeRefs.ts => useComposedRefs.ts} (81%) diff --git a/packages/components/checkbox/src/checkbox.ts b/packages/components/checkbox/src/checkbox.ts index dd2cd9d14..83767bbb6 100644 --- a/packages/components/checkbox/src/checkbox.ts +++ b/packages/components/checkbox/src/checkbox.ts @@ -3,7 +3,7 @@ import type { PropType, Ref } from 'vue' import { computed, defineComponent, h, ref, toRefs, watchEffect } from 'vue' import { composeEventHandlers } from '@oku-ui/utils' -import { useComposeRefs, useControllable, useForwardRef } from '@oku-ui/use-composable' +import { useComposedRefs, useControllable, useForwardRef } from '@oku-ui/use-composable' import { Primitive } from '@oku-ui/primitive' import type { ComponentPublicInstanceRef, ElementType, InstanceTypeRef, MergeProps, PrimitiveProps } from '@oku-ui/primitive' @@ -73,7 +73,7 @@ const Checkbox = defineComponent({ const buttonRef = ref | null>(null) const forwardedRef = useForwardRef() - const composedRefs = useComposeRefs(buttonRef, forwardedRef) + const composedRefs = useComposedRefs(buttonRef, forwardedRef) const { name, diff --git a/packages/components/collapsible/src/collapsibleContentImpl.ts b/packages/components/collapsible/src/collapsibleContentImpl.ts index c20ca1b72..78fbaaf9c 100644 --- a/packages/components/collapsible/src/collapsibleContentImpl.ts +++ b/packages/components/collapsible/src/collapsibleContentImpl.ts @@ -4,7 +4,7 @@ import type { ComponentPublicInstanceRef, ElementType, InstanceTypeRef, MergePro import type { Scope } from '@oku-ui/provide' import { Primitive } from '@oku-ui/primitive' -import { useComposeRefs, useForwardRef } from '@oku-ui/use-composable' +import { useComposedRefs, useForwardRef } from '@oku-ui/use-composable' import { useCollapsibleInject } from './collapsible' import { getState } from './utils' import { CONTENT_NAME } from './collapsibleContent' @@ -36,7 +36,7 @@ const CollapsibleContentImpl = defineComponent({ const _ref = ref | undefined>(undefined) const forwardedRef = useForwardRef() - const composedRefs = useComposeRefs(_ref, forwardedRef) + const composedRefs = useComposedRefs(_ref, forwardedRef) const heightRef = ref(0) const widthRef = ref(0) diff --git a/packages/components/popper/src/popperAnchor.ts b/packages/components/popper/src/popperAnchor.ts index 29145cee9..058031527 100644 --- a/packages/components/popper/src/popperAnchor.ts +++ b/packages/components/popper/src/popperAnchor.ts @@ -11,7 +11,7 @@ import type { import type { Measurable } from '@oku-ui/utils' import type { Scope } from '@oku-ui/provide' import { Primitive } from '@oku-ui/primitive' -import { useComposeRefs, useForwardRef } from '@oku-ui/use-composable' +import { useComposedRefs, useForwardRef } from '@oku-ui/use-composable' import { usePopperInject } from './popper' /* ------------------------------------------------------------------------------------------------- @@ -53,7 +53,7 @@ const PopperAnchor = defineComponent({ const inject = usePopperInject(ANCHOR_NAME, scopeCheckbox.value) const _ref = ref | null>(null) - const composedRefs = useComposeRefs(_ref, useForwardRef()) + const composedRefs = useComposedRefs(_ref, useForwardRef()) watch(_ref, () => { inject.value.anchor.value diff --git a/packages/components/popper/src/popperContent.ts b/packages/components/popper/src/popperContent.ts index 532766f15..33100bcd3 100644 --- a/packages/components/popper/src/popperContent.ts +++ b/packages/components/popper/src/popperContent.ts @@ -4,7 +4,7 @@ import { computed, defineComponent, h, onMounted, ref, toRefs, watch, watchEffec import { Primitive } from '@oku-ui/primitive' import type { ComponentPublicInstanceRef, ElementType, InstanceTypeRef, MergeProps, PrimitiveProps } from '@oku-ui/primitive' import type { Scope } from '@oku-ui/provide' -import { computedEager, useCallbackRef, useComposeRefs, useForwardRef, useSize } from '@oku-ui/use-composable' +import { computedEager, useCallbackRef, useComposedRefs, useForwardRef, useSize } from '@oku-ui/use-composable' import { autoUpdate, flip, arrow as floatingUIarrow, hide, limitShift, offset, shift, size, useFloating } from '@floating-ui/vue' import type { DetectOverflowOptions, @@ -148,7 +148,7 @@ const PopperContent = defineComponent({ const inject = usePopperInject(CONTENT_NAME, scopePopper.value) const content = ref | null>(null) - const composedRefs = useComposeRefs(content, useForwardRef()) + const composedRefs = useComposedRefs(content, useForwardRef()) const arrow = ref(null) const arrowSize = useSize(arrow) diff --git a/packages/components/slot/src/slot.ts b/packages/components/slot/src/slot.ts index 635107422..79803c622 100644 --- a/packages/components/slot/src/slot.ts +++ b/packages/components/slot/src/slot.ts @@ -1,5 +1,5 @@ import { cloneVNode, createVNode, defineComponent, mergeProps } from 'vue' -import { useComposeRefs, useForwardRef } from '@oku-ui/use-composable' +import { useComposedRefs, useForwardRef } from '@oku-ui/use-composable' import { isSlottable } from './utils' const NAME = 'OkuSlot' @@ -9,7 +9,7 @@ const OkuSlot = defineComponent({ inheritAttrs: false, setup(props, { attrs, slots }) { const forwarded = useForwardRef() - const composedRefs = useComposeRefs(forwarded) + const composedRefs = useComposedRefs(forwarded) return () => { const defaultSlot = slots.default?.() diff --git a/packages/components/switch/src/Switch.ts b/packages/components/switch/src/Switch.ts index 0129620c2..96b0f98c7 100644 --- a/packages/components/switch/src/Switch.ts +++ b/packages/components/switch/src/Switch.ts @@ -9,7 +9,7 @@ import { toValue, useModel, } from 'vue' -import { useComposeRefs, useControllable, useForwardRef } from '@oku-ui/use-composable' +import { useComposedRefs, useControllable, useForwardRef } from '@oku-ui/use-composable' import type { ComponentPublicInstanceRef, ElementType, @@ -111,7 +111,7 @@ const Switch = defineComponent({ const buttonRef = ref | null>(null) const forwardedRef = useForwardRef() - const composedRefs = useComposeRefs(buttonRef, forwardedRef) + const composedRefs = useComposedRefs(buttonRef, forwardedRef) const modelValue = useModel(props, 'modelValue') diff --git a/packages/core/use-composable/src/index.ts b/packages/core/use-composable/src/index.ts index 7fe211354..c65bcb82c 100644 --- a/packages/core/use-composable/src/index.ts +++ b/packages/core/use-composable/src/index.ts @@ -6,7 +6,7 @@ export { useSize } from './useSize' export { usePrevious } from './usePrevious' export { unrefElement } from './unrefElement' export { useId } from './useId' -export { useComposeRefs } from './useComposeRefs' +export { useComposedRefs } from './useComposedRefs' export { useForwardRef } from './useForwardRef' export { useEscapeKeydown } from './useEscapeKeydown' export type { MaybeComputedElementRef } from './unrefElement' diff --git a/packages/core/use-composable/src/useComposeRefs.ts b/packages/core/use-composable/src/useComposedRefs.ts similarity index 81% rename from packages/core/use-composable/src/useComposeRefs.ts rename to packages/core/use-composable/src/useComposedRefs.ts index d82615ee4..cf710e5ae 100644 --- a/packages/core/use-composable/src/useComposeRefs.ts +++ b/packages/core/use-composable/src/useComposedRefs.ts @@ -10,7 +10,7 @@ export type RefSetter = ( el: Element | ComponentPublicInstance | undefined ) => void -export function useComposeRefs(...refs: (Ref | RefSetter)[]) { +export function useComposedRefs(...refs: (Ref | RefSetter)[]) { return (el: Element | ComponentPublicInstance | null) => { refs.forEach((ref) => { if (isFunction(ref)) diff --git a/packages/core/use-composable/tests/useComposeRefs.test.ts b/packages/core/use-composable/tests/useComposeRefs.test.ts index dd2c240e2..ba60a95c3 100644 --- a/packages/core/use-composable/tests/useComposeRefs.test.ts +++ b/packages/core/use-composable/tests/useComposeRefs.test.ts @@ -2,7 +2,7 @@ import type { Component, DefineComponent } from 'vue' import { h, onMounted, ref } from 'vue' import { describe, expect, test } from 'vitest' import { mount } from '@vue/test-utils' -import { useComposeRefs } from '../src/useComposeRefs' +import { useComposedRefs } from '../src/useComposedRefs' const DivComponent: Component = { name: 'Refs', @@ -12,7 +12,7 @@ const DivComponent: Component = { const ref2 = ref() const ref3 = ref() - const refs = useComposeRefs(ref1, ref2, ref3) + const refs = useComposedRefs(ref1, ref2, ref3) onMounted(() => { expect(ref1.value).toBeInstanceOf(HTMLDivElement) expect(ref2.value).toBeInstanceOf(HTMLDivElement) @@ -43,7 +43,7 @@ describe('Provide', () => { const ref1 = ref() const ref2 = ref() const ref3 = ref() - const refs = useComposeRefs(ref1, ref2, ref3) + const refs = useComposedRefs(ref1, ref2, ref3) onMounted(() => { expect(ref1.value).toBeInstanceOf(HTMLDivElement) expect(ref2.value).toBeInstanceOf(HTMLDivElement) diff --git a/packages/core/use-composable/tests/useForwardRef.ts b/packages/core/use-composable/tests/useForwardRef.ts index c6001990e..781b14d79 100644 --- a/packages/core/use-composable/tests/useForwardRef.ts +++ b/packages/core/use-composable/tests/useForwardRef.ts @@ -2,7 +2,7 @@ import type { Component, DefineComponent } from 'vue' import { h, onMounted, ref } from 'vue' import { describe, expect, test } from 'vitest' import { mount } from '@vue/test-utils' -import { useComposeRefs } from '../src/useComposeRefs' +import { useComposedRefs } from '../src/useComposedRefs' import { useForwardRef } from '../src/useForwardRef' const DivComponent: Component = { @@ -13,7 +13,7 @@ const DivComponent: Component = { const ref2 = ref() const ref3 = ref() - const refs = useComposeRefs(ref1, ref2, ref3, useForwardRef()) + const refs = useComposedRefs(ref1, ref2, ref3, useForwardRef()) onMounted(() => { expect(ref1.value).toBeInstanceOf(HTMLDivElement) expect(ref2.value).toBeInstanceOf(HTMLDivElement) @@ -44,7 +44,7 @@ describe('Provide', () => { const ref1 = ref() const ref2 = ref() const ref3 = ref() - const refs = useComposeRefs(ref1, ref2, ref3) + const refs = useComposedRefs(ref1, ref2, ref3) onMounted(() => { expect(ref1.value).toBeInstanceOf(HTMLDivElement) expect(ref2.value).toBeInstanceOf(HTMLDivElement)