-
Notifications
You must be signed in to change notification settings - Fork 34
feat(collapsible): add new component collapsible #199
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 7 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
1a73002
feat: add useId
YeSuX 032bffd
fix: useId bug
YeSuX 0e787e4
Merge branch 'main' into collapsible
YeSuX f36bba1
feat: add collapsible
YeSuX 40e6364
feat: add collapsible
YeSuX 8517bc0
Merge branch 'collapsible' of https://github.com/YeSuX/primitives int…
YeSuX 1cbaf3c
Merge branch 'main' into collapsible
productdevbook adf5b2f
restore: avatar stories
productdevbook 838d891
refactor: collapsible
productdevbook 4f30165
feat: add story
YeSuX 01a0c1e
fix: disable spell error
YeSuX File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
# `@oku-ui/collapsible` | ||
|
||
## Installation | ||
|
||
```sh | ||
$ pnpm add @oku-ui/collapsible | ||
``` | ||
|
||
## Usage | ||
... |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
import { defineBuildConfig } from 'unbuild' | ||
|
||
export default defineBuildConfig({ | ||
entries: [ | ||
{ | ||
builder: 'mkdist', | ||
input: './src/', | ||
pattern: ['**/!(*.test|*.stories).ts'], | ||
}, | ||
], | ||
declaration: true, | ||
}) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
{ | ||
"name": "@oku-ui/collapsible", | ||
"type": "module", | ||
"version": "0.1.3", | ||
"license": "MIT", | ||
"source": "src/index.ts", | ||
"funding": "https://github.com/sponsors/productdevbook", | ||
"homepage": "https://oku-ui.com/primitives", | ||
"repository": { | ||
"type": "git", | ||
"url": "git+https://github.com/oku-ui/primitives.git", | ||
"directory": "packages/components/collapsible" | ||
}, | ||
"bugs": { | ||
"url": "https://github.com/oku-ui/primitives/issues" | ||
}, | ||
"exports": { | ||
".": { | ||
"types": "./dist/index.d.ts", | ||
"import": "./dist/index.mjs" | ||
} | ||
}, | ||
"module": "./dist/index.mjs", | ||
"types": "./dist/index.d.ts", | ||
"files": [ | ||
"dist" | ||
], | ||
"scripts": { | ||
"build": "tsup", | ||
"dev": "tsup --watch" | ||
}, | ||
"peerDependencies": { | ||
"vue": "^3.3.2" | ||
}, | ||
"dependencies": { | ||
"@oku-ui/primitive": "workspace:^", | ||
"@oku-ui/provide": "workspace:^", | ||
"@oku-ui/use-composable": "workspace:^", | ||
"@oku-ui/utils": "workspace:^" | ||
}, | ||
"devDependencies": { | ||
"tsconfig": "workspace:^" | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,236 @@ | ||
import type { ComponentPublicInstance, PropType, Ref } from 'vue' | ||
import { Transition, computed, defineComponent, h, ref, toRefs } from 'vue' | ||
import type { ElementType } from '@oku-ui/primitive' | ||
import type { Scope } from '@oku-ui/provide' | ||
import { createProvideScope } from '@oku-ui/provide' | ||
import { Primitive } from '@oku-ui/primitive' | ||
import { composeEventHandlers } from '@oku-ui/utils' | ||
|
||
import { useControllableRef, useId } from '@oku-ui/use-composable' | ||
|
||
// import { useId } from '../../../core/use-composable/src/index' | ||
|
||
// ---Collapsible--- | ||
interface CollapsibleProps { } | ||
type CollapsibleElement = ElementType<'div'> | ||
type CollapsibleTriggerElement = ElementType<'button'> | ||
type CollapsibleContextValue = { | ||
contentId: string | ||
disabled?: Ref<boolean> | ||
open: Ref<boolean> | ||
onOpenToggle(): void | ||
} | ||
|
||
const COLLAPSIBLE_NAME = 'Collapsible' | ||
const [createCollapsibleContext, createCollapsibleScope] = createProvideScope(COLLAPSIBLE_NAME) | ||
const [collapsibleProvider, useCollapsibleContext] | ||
= createCollapsibleContext<CollapsibleContextValue>(COLLAPSIBLE_NAME) | ||
|
||
const Collapsible = defineComponent({ | ||
name: COLLAPSIBLE_NAME, | ||
inheritAttrs: false, | ||
props: { | ||
defaultOpen: { | ||
type: Boolean, | ||
}, | ||
open: { | ||
type: Boolean, | ||
default: false, | ||
}, | ||
disable: { | ||
YeSuX marked this conversation as resolved.
Show resolved
Hide resolved
|
||
type: Boolean, | ||
default: false, | ||
}, | ||
scopeCollapsible: { | ||
type: Object as unknown as PropType<Scope>, | ||
required: false, | ||
}, | ||
onOpenChange: { | ||
type: Function as PropType<(open: boolean) => void>, | ||
}, | ||
}, | ||
setup(props, { attrs, slots, expose }) { | ||
const innerRef = ref<ComponentPublicInstance>() | ||
const { ...CollapsibleProps } = attrs as CollapsibleElement | ||
const { disable, scopeCollapsible, open, defaultOpen } = toRefs(props) | ||
|
||
// const { _ref: collapsibleRef, refEl: collapsibleRefEl } = useRef<CollapsibleElement>() | ||
|
||
expose({ | ||
innerRef: computed(() => innerRef.value?.$el), | ||
}) | ||
|
||
const { state } = useControllableRef({ | ||
prop: open.value, | ||
onChange: props.onOpenChange, | ||
defaultProp: defaultOpen.value, | ||
}) | ||
|
||
collapsibleProvider({ | ||
contentId: useId(), | ||
disabled: disable, | ||
open: state, | ||
onOpenToggle() { | ||
// TODO: Need Help!!! | ||
state.value = !state.value | ||
YeSuX marked this conversation as resolved.
Show resolved
Hide resolved
|
||
}, | ||
scope: scopeCollapsible.value, | ||
}) | ||
|
||
const originalReturn = () => h( | ||
Primitive.div, | ||
{ | ||
'data-state': getState(state.value), | ||
'data-disable': disable.value ? '' : undefined, | ||
'ref': innerRef, | ||
...CollapsibleProps, | ||
}, | ||
slots.default && slots.default(), | ||
) | ||
return originalReturn | ||
}, | ||
}) | ||
|
||
// ---CollapsibleTrigger--- | ||
const TRIGGER_NAME = 'CollapsibleTrigger' | ||
|
||
const CollapsibleTrigger = defineComponent({ | ||
name: TRIGGER_NAME, | ||
inheritAttrs: false, | ||
props: { | ||
scopeCollapsible: { | ||
type: Object as unknown as PropType<Scope>, | ||
required: false, | ||
}, | ||
}, | ||
setup(props, { attrs, slots, expose }) { | ||
const { scopeCollapsible } = toRefs(props) | ||
const innerRef = ref<ComponentPublicInstance>() | ||
const { ...triggerProps } = attrs as CollapsibleTriggerElement | ||
const context = useCollapsibleContext(TRIGGER_NAME, scopeCollapsible.value) | ||
|
||
expose({ | ||
innerRef: computed(() => innerRef.value?.$el), | ||
}) | ||
|
||
const originalReturn = () => h( | ||
Primitive.button, | ||
{ | ||
'type': 'button', | ||
'aria-controls': context.value.contentId, | ||
'aria-expanded': context.value.open.value || false, | ||
'data-state': getState(context.value.open.value), | ||
'data-disabled': context.value.disabled?.value ? '' : undefined, | ||
'disabled': context.value.disabled?.value, | ||
...triggerProps, | ||
'ref': innerRef, | ||
'onClick': composeEventHandlers(triggerProps.onClick, context.value.onOpenToggle), | ||
}, | ||
slots.default && slots.default(), | ||
) | ||
return originalReturn | ||
}, | ||
}) | ||
|
||
// ---CollapsibleContentImpl--- | ||
const CONTENT_NAME = 'CollapsibleContent' | ||
|
||
const CollapsibleContentImpl = defineComponent({ | ||
inheritAttrs: false, | ||
props: { | ||
present: { | ||
type: Boolean, | ||
}, | ||
scopeCollapsible: { | ||
type: Object as unknown as PropType<Scope>, | ||
required: false, | ||
}, | ||
}, | ||
setup(props, { attrs, slots, expose }) { | ||
const { scopeCollapsible, present } = toRefs(props) | ||
const { ...contentProps } = attrs | ||
const context = useCollapsibleContext(CONTENT_NAME, scopeCollapsible.value) | ||
const innerRef = ref<ComponentPublicInstance>() | ||
|
||
const isPresent = ref(present.value) | ||
const isOpen = computed(() => context.value.open.value || isPresent.value) | ||
|
||
expose({ | ||
innerRef: computed(() => innerRef.value?.$el), | ||
}) | ||
|
||
const originalReturn = () => h( | ||
Primitive.div, | ||
{ | ||
'data-state': getState(context.value.open.value), | ||
'data-disabled': context.value.disabled?.value ? '' : undefined, | ||
'id': context.value.contentId, | ||
'hidden': !isOpen.value, | ||
...contentProps, | ||
'ref': innerRef, | ||
'style': { | ||
// ...attrs.style, | ||
}, | ||
}, | ||
isOpen.value ? slots.default : undefined, | ||
) | ||
|
||
return originalReturn | ||
}, | ||
}) | ||
|
||
// ---CollapsibleContent--- | ||
|
||
const CollapsibleContent = defineComponent({ | ||
name: CONTENT_NAME, | ||
inheritAttrs: false, | ||
props: { | ||
forceMount: { | ||
type: Boolean, | ||
default: true, | ||
}, | ||
scopeCollapsible: { | ||
type: Object as unknown as PropType<Scope>, | ||
required: false, | ||
}, | ||
}, | ||
setup(props, { attrs, slots, expose }) { | ||
const { forceMount, scopeCollapsible } = toRefs(props) | ||
const { ...contentProps } = attrs | ||
const innerRef = ref<ComponentPublicInstance>() | ||
const context = useCollapsibleContext(CONTENT_NAME, scopeCollapsible.value) | ||
|
||
expose({ | ||
innerRef: computed(() => innerRef.value?.$el), | ||
}) | ||
|
||
const originalReturn = () => h( | ||
Transition, | ||
{}, | ||
h( | ||
CollapsibleContentImpl, | ||
{ | ||
...contentProps, | ||
ref: innerRef, | ||
}, | ||
slots.default && slots.default(), | ||
), | ||
) | ||
return originalReturn | ||
}, | ||
}) | ||
|
||
// ---export--- | ||
function getState(open?: boolean) { | ||
return open ? 'open' : 'closed' | ||
} | ||
|
||
export { | ||
Collapsible, | ||
CollapsibleTrigger, | ||
CollapsibleContent, | ||
} | ||
|
||
export type { | ||
CollapsibleProps, | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
export { | ||
Collapsible, | ||
} from './collapsible' |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.