-
Notifications
You must be signed in to change notification settings - Fork 3
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
Padma t1 #202
Merged
Merged
Padma t1 #202
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
87983e1
first pass through Padma feedback
daniel-belcher 92468f8
text changes
daniel-belcher 2e7a9ca
Merge branch 'webforms' into padma-t1
daniel-belcher 92ea530
add char limit to fields and text changes
daniel-belcher 9469391
text changes
daniel-belcher 76ad120
feat: add select sorting
daniel-belcher 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 contains 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 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 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 |
---|---|---|
|
@@ -29,7 +29,7 @@ import { format } from "date-fns"; | |
import { RHFFieldArray } from "./FieldArray"; | ||
import { FieldGroup } from "./FieldGroup"; | ||
import type { RHFSlotProps, RHFComponentMap, FormGroup } from "./types"; | ||
import { useEffect } from "react"; | ||
import { useEffect, useMemo } from "react"; | ||
|
||
export const RHFSlot = < | ||
TFieldValues extends FieldValues = FieldValues, | ||
|
@@ -86,6 +86,17 @@ export const RHFSlot = < | |
{rhf === "Select" && | ||
(() => { | ||
const hops = props as RHFComponentMap["Select"]; | ||
const opts = useMemo(() => { | ||
if (hops.sort) { | ||
const sorted = hops.options.sort((a, b) => | ||
a.label.localeCompare(b.label) | ||
); | ||
hops.sort === "descending" && sorted.reverse(); | ||
return sorted; | ||
} | ||
return hops.options; | ||
}, [hops.options, hops.sort]); | ||
Comment on lines
+89
to
+98
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nice! |
||
|
||
return ( | ||
<Select | ||
{...hops} | ||
|
@@ -96,7 +107,7 @@ export const RHFSlot = < | |
<SelectValue {...hops} /> | ||
</SelectTrigger> | ||
<SelectContent className="overflow-auto max-h-60"> | ||
{hops.options.map((OPT) => ( | ||
{opts.map((OPT) => ( | ||
<SelectItem key={`OPT-${OPT.value}`} value={OPT.value}> | ||
{OPT.label} | ||
</SelectItem> | ||
|
@@ -264,6 +275,7 @@ export const RHFSlot = < | |
name={name} | ||
fields={rest.fields ?? []} | ||
groupNamePrefix={groupNamePrefix} | ||
{...(props as RHFComponentMap["FieldArray"])} | ||
/> | ||
)} | ||
|
||
|
This file contains 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
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.
Could this be:
charcountStyling?
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.
Where it's being applied it causes a loud warning about needing to be lowercase for custom DOM attributes.
There's probably a better way to add these two properties in general.
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.
I see makes sense