-
-
Notifications
You must be signed in to change notification settings - Fork 179
a117: extract explicit tag components with enforce a11y #779
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
Draft
essenmitsosse
wants to merge
6
commits into
npmx-dev:main
Choose a base branch
from
essenmitsosse:a117-enforce-props
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+224
−71
Draft
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
42cb187
refactor: extract explicit tag components with enforce a11y
essenmitsosse f0876f4
refacor: cleanup
essenmitsosse 6d88d79
Revert "refacor: cleanup"
essenmitsosse 314c792
refactor: use pure css for radio button styling
essenmitsosse 48912a8
Merge branch 'main' into a117-enforce-props
essenmitsosse 23cb481
fix regression
essenmitsosse 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
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
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
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
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
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
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,31 @@ | ||
| <script setup lang="ts"> | ||
| const props = defineProps<{ | ||
| disabled?: boolean | ||
| /** | ||
| * type should never be used, because this will always be a button. | ||
| * | ||
| * If you want a link use `TagLink` instead. | ||
| * */ | ||
| type?: never | ||
| pressed?: boolean | ||
| }>() | ||
| </script> | ||
|
|
||
| <template> | ||
| <button | ||
| class="inline-flex items-center px-2 py-0.5 text-xs font-mono border rounded transition-colors duration-200 focus-visible:ring-2 focus-visible:ring-fg focus-visible:ring-offset-1" | ||
| :class="[ | ||
| pressed | ||
| ? 'bg-fg text-bg border-fg hover:(text-text-bg/50)' | ||
| : 'bg-bg-muted text-fg-muted border-border hover:(text-fg border-border-hover)', | ||
| { | ||
| 'opacity-50 cursor-not-allowed': disabled, | ||
| }, | ||
| ]" | ||
| type="button" | ||
| :disabled="disabled ? true : undefined" | ||
| :aria-pressed="pressed" | ||
| > | ||
| <slot /> | ||
| </button> | ||
| </template> |
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,36 @@ | ||
| <script setup lang="ts"> | ||
| import type { NuxtLinkProps } from '#app' | ||
|
|
||
| const { current, ...props } = defineProps< | ||
| { | ||
| /** Disabled links will be displayed as plain text */ | ||
| disabled?: boolean | ||
| /** | ||
| * `type` should never be used, because this will always be a link. | ||
| * | ||
| * If you want a button use `TagButton` instead. | ||
| * */ | ||
| type?: never | ||
| current?: boolean | ||
| } & | ||
| /** This makes sure the link always has either `to` or `href` */ | ||
| (Required<Pick<NuxtLinkProps, 'to'>> | Required<Pick<NuxtLinkProps, 'href'>>) & | ||
| NuxtLinkProps | ||
| >() | ||
| </script> | ||
|
|
||
| <template> | ||
| <span v-if="disabled" class="opacity-50"><slot /></span> | ||
| <NuxtLink | ||
| v-else | ||
| class="inline-flex items-center px-2 py-0.5 text-xs font-mono border rounded transition-colors duration-200 focus-visible:ring-2 focus-visible:ring-fg focus-visible:ring-offset-1" | ||
| :class="{ | ||
| 'bg-bg-muted text-fg-muted border-border hover:(text-fg border-border-hover)': !current, | ||
| 'bg-fg text-bg border-fg hover:(text-text-bg/50)': current, | ||
| 'opacity-50 cursor-not-allowed': disabled, | ||
| }" | ||
| v-bind="props" | ||
| > | ||
| <slot /> | ||
| </NuxtLink> | ||
| </template> | ||
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,60 @@ | ||
| <script setup lang="ts"> | ||
| const model = defineModel() | ||
|
|
||
| const props = defineProps<{ | ||
| disabled?: boolean | ||
| /** | ||
| * type should never be used, because this will always be a button. | ||
| * | ||
| * If you want a link use `TagLink` instead. | ||
| * */ | ||
| type?: never | ||
|
|
||
| /** Shouldn't try to set `checked` explicitly, is handled internally */ | ||
| checked?: never | ||
| value: string | ||
| }>() | ||
|
|
||
| const uid = useId() | ||
| const internalId = `${model.value}-${uid}` | ||
| const checked = computed(() => model.value === props.value) | ||
| /** Todo: This shouldn't be necessary, but using v-model on `input type=radio` doesn't work as expected in Vue */ | ||
| const onChange = () => { | ||
| model.value = props.value | ||
| } | ||
| </script> | ||
|
|
||
| <template> | ||
| <div> | ||
| <input | ||
| type="radio" | ||
| :id="internalId" | ||
| :value="props.value" | ||
| :checked="checked" | ||
| :disabled="props.disabled ? true : undefined" | ||
| @change="onChange" | ||
| class="peer" | ||
| /> | ||
| <label | ||
| class="bg-bg-muted text-fg-muted border-border hover:(text-fg border-border-hover) inline-flex items-center px-2 py-0.5 text-xs font-mono border rounded transition-colors duration-200 peer-focus:ring-2 peer-focus:ring-fg border-none peer-checked:(bg-fg text-bg border-fg hover:(text-text-bg/50)) peer-disabled:(opacity-50 pointer-events-none)" | ||
| :htmlFor="internalId" | ||
| > | ||
| <slot /> | ||
| </label> | ||
| </div> | ||
| </template> | ||
|
|
||
| <style scoped> | ||
| input[type='radio'] { | ||
| position: absolute; | ||
| opacity: 0; | ||
| width: 1px; | ||
| height: 1px; | ||
| margin: -1px; | ||
| overflow: hidden; | ||
| clip: rect(0 0 0 0); | ||
| clip-path: inset(50%); | ||
| white-space: nowrap; | ||
| border: 0; | ||
| } | ||
| </style> |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we should probably have a number of the other styles so it looks visually similar or you'd experience layout shift when disabling a button
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, this was a quick one, because this isn't used anywhere yet. Just wanted to sketch it out.