Improvement/cal 639 turn edit location dialog into radix uu (#1055)
* replaced disclosure with collapsible * added radix radio-group * removed radix-UI radio group * more fix * --WIP * --WIP * react-hook-formify --WIP * radix ui radio replaces headless ui radio * further fixes --WIP * --WIP * form handling and availability wrapping * minuteField fix * availability fix * fixed react-select menu overflow in dialog * --WIP * added default value for custom inputs * fixed locations * fixed daterangepicker * fixed team eventType * basic cleanup --wip * fixed locations removal bug * removed old locations state remnants * some cleanup --wip * rebase conflict resolution * removed debug rem and fixed radio text size * further requested changes Co-authored-by: Bailey Pumfleet <pumfleet@hey.com> Co-authored-by: Omar López <zomars@me.com>
This commit is contained in:
parent
24e36ad46a
commit
d8b3c42c28
5 changed files with 844 additions and 716 deletions
|
@ -8,7 +8,7 @@ const MinutesField = forwardRef<HTMLInputElement, Props>(({ label, ...rest }, re
|
||||||
return (
|
return (
|
||||||
<div className="block sm:flex">
|
<div className="block sm:flex">
|
||||||
<div className="mb-4 min-w-48 sm:mb-0">
|
<div className="mb-4 min-w-48 sm:mb-0">
|
||||||
<label htmlFor={rest.id} className="flex text-sm font-medium text-neutral-700">
|
<label htmlFor={rest.id} className="flex items-center h-full text-sm font-medium text-neutral-700">
|
||||||
{label}
|
{label}
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -15,15 +15,10 @@ export type AdvancedOptions = {
|
||||||
price?: number;
|
price?: number;
|
||||||
currency?: string;
|
currency?: string;
|
||||||
schedulingType?: SchedulingType;
|
schedulingType?: SchedulingType;
|
||||||
users?: {
|
users?: string[];
|
||||||
value: number;
|
|
||||||
label: string;
|
|
||||||
avatar: string;
|
|
||||||
}[];
|
|
||||||
availability?: { openingHours: WorkingHours[]; dateOverrides: WorkingHours[] };
|
availability?: { openingHours: WorkingHours[]; dateOverrides: WorkingHours[] };
|
||||||
customInputs?: EventTypeCustomInput[];
|
customInputs?: EventTypeCustomInput[];
|
||||||
timeZone: string;
|
timeZone?: string;
|
||||||
hidden: boolean;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
export type EventTypeCustomInput = {
|
export type EventTypeCustomInput = {
|
||||||
|
@ -55,7 +50,5 @@ export type EventTypeInput = AdvancedOptions & {
|
||||||
length: number;
|
length: number;
|
||||||
hidden: boolean;
|
hidden: boolean;
|
||||||
locations: unknown;
|
locations: unknown;
|
||||||
customInputs: EventTypeCustomInput[];
|
|
||||||
timeZone: string;
|
|
||||||
availability?: { openingHours: WorkingHours[]; dateOverrides: WorkingHours[] };
|
availability?: { openingHours: WorkingHours[]; dateOverrides: WorkingHours[] };
|
||||||
};
|
};
|
||||||
|
|
|
@ -42,6 +42,7 @@
|
||||||
"@radix-ui/react-dialog": "^0.1.0",
|
"@radix-ui/react-dialog": "^0.1.0",
|
||||||
"@radix-ui/react-dropdown-menu": "^0.1.1",
|
"@radix-ui/react-dropdown-menu": "^0.1.1",
|
||||||
"@radix-ui/react-id": "^0.1.0",
|
"@radix-ui/react-id": "^0.1.0",
|
||||||
|
"@radix-ui/react-radio-group": "^0.1.1",
|
||||||
"@radix-ui/react-slider": "^0.1.1",
|
"@radix-ui/react-slider": "^0.1.1",
|
||||||
"@radix-ui/react-switch": "^0.1.1",
|
"@radix-ui/react-switch": "^0.1.1",
|
||||||
"@radix-ui/react-tooltip": "^0.1.0",
|
"@radix-ui/react-tooltip": "^0.1.0",
|
||||||
|
|
File diff suppressed because it is too large
Load diff
28
yarn.lock
28
yarn.lock
|
@ -1482,6 +1482,17 @@
|
||||||
"@radix-ui/react-id" "0.1.1"
|
"@radix-ui/react-id" "0.1.1"
|
||||||
"@radix-ui/react-primitive" "0.1.1"
|
"@radix-ui/react-primitive" "0.1.1"
|
||||||
|
|
||||||
|
"@radix-ui/react-label@0.1.1":
|
||||||
|
version "0.1.1"
|
||||||
|
resolved "https://registry.yarnpkg.com/@radix-ui/react-label/-/react-label-0.1.1.tgz#c2970b19214248c2b3a0425c3c0d299290b559a5"
|
||||||
|
integrity sha512-52mHm7gxDcbY1+XuFwe0zBvUHp+JP424QC5V2nloPH9JUpCsM2MfviqA/nyW4nKuoGAeF6MhedjtlrXyze8DFw==
|
||||||
|
dependencies:
|
||||||
|
"@babel/runtime" "^7.13.10"
|
||||||
|
"@radix-ui/react-compose-refs" "0.1.0"
|
||||||
|
"@radix-ui/react-context" "0.1.1"
|
||||||
|
"@radix-ui/react-id" "0.1.1"
|
||||||
|
"@radix-ui/react-primitive" "0.1.1"
|
||||||
|
|
||||||
"@radix-ui/react-menu@0.1.1":
|
"@radix-ui/react-menu@0.1.1":
|
||||||
version "0.1.1"
|
version "0.1.1"
|
||||||
resolved "https://registry.yarnpkg.com/@radix-ui/react-menu/-/react-menu-0.1.1.tgz#2146352813ac086df5f021d06bce10f7f56d2577"
|
resolved "https://registry.yarnpkg.com/@radix-ui/react-menu/-/react-menu-0.1.1.tgz#2146352813ac086df5f021d06bce10f7f56d2577"
|
||||||
|
@ -1547,6 +1558,23 @@
|
||||||
"@babel/runtime" "^7.13.10"
|
"@babel/runtime" "^7.13.10"
|
||||||
"@radix-ui/react-slot" "0.1.1"
|
"@radix-ui/react-slot" "0.1.1"
|
||||||
|
|
||||||
|
"@radix-ui/react-radio-group@^0.1.1":
|
||||||
|
version "0.1.1"
|
||||||
|
resolved "https://registry.yarnpkg.com/@radix-ui/react-radio-group/-/react-radio-group-0.1.1.tgz#e46861abd472f52ed57c8379e4e8301bbc503ed1"
|
||||||
|
integrity sha512-K6vrFSI62qEnF6ltlyK0pzY9w/Y/HnmheUFcHSfWpyyBU6vmoU/Vdy1ZDAejDtDfdthSrk/L8wczF1OPmIjB2w==
|
||||||
|
dependencies:
|
||||||
|
"@babel/runtime" "^7.13.10"
|
||||||
|
"@radix-ui/primitive" "0.1.0"
|
||||||
|
"@radix-ui/react-compose-refs" "0.1.0"
|
||||||
|
"@radix-ui/react-context" "0.1.1"
|
||||||
|
"@radix-ui/react-label" "0.1.1"
|
||||||
|
"@radix-ui/react-presence" "0.1.1"
|
||||||
|
"@radix-ui/react-primitive" "0.1.1"
|
||||||
|
"@radix-ui/react-roving-focus" "0.1.1"
|
||||||
|
"@radix-ui/react-use-controllable-state" "0.1.0"
|
||||||
|
"@radix-ui/react-use-previous" "0.1.0"
|
||||||
|
"@radix-ui/react-use-size" "0.1.0"
|
||||||
|
|
||||||
"@radix-ui/react-roving-focus@0.1.1":
|
"@radix-ui/react-roving-focus@0.1.1":
|
||||||
version "0.1.1"
|
version "0.1.1"
|
||||||
resolved "https://registry.yarnpkg.com/@radix-ui/react-roving-focus/-/react-roving-focus-0.1.1.tgz#6a7965f6315fae91061b14d6380949a4697e87b9"
|
resolved "https://registry.yarnpkg.com/@radix-ui/react-roving-focus/-/react-roving-focus-0.1.1.tgz#6a7965f6315fae91061b14d6380949a4697e87b9"
|
||||||
|
|
Loading…
Reference in a new issue