From e5ea451e4257dbd6eb2a3a156602c03dd282bca3 Mon Sep 17 00:00:00 2001 From: Konstantinos Kaloutas Date: Thu, 13 Apr 2023 15:21:25 +0300 Subject: [PATCH] feat: introduce global scale level option --- tldraw/apps/tldraw-logseq/package.json | 2 +- .../ContextBar/contextBarActionFactory.tsx | 41 +------ .../components/PrimaryTools/PrimaryTools.tsx | 2 + .../src/components/inputs/ScaleInput.tsx | 59 ++++++++++ .../src/components/inputs/SelectInput.tsx | 19 ++-- .../apps/tldraw-logseq/src/hooks/usePaste.ts | 3 + .../tldraw-logseq/src/lib/shapes/BoxShape.tsx | 1 + .../src/lib/shapes/EllipseShape.tsx | 1 + .../src/lib/shapes/PolygonShape.tsx | 1 + tldraw/apps/tldraw-logseq/src/styles.css | 13 ++- tldraw/packages/core/src/lib/TLApi/TLApi.ts | 13 +++ tldraw/packages/core/src/lib/TLSettings.ts | 2 + .../core/src/lib/shapes/TLShape/TLShape.tsx | 1 + .../tools/TLBoxTool/states/CreatingState.tsx | 1 + .../tools/TLDrawTool/states/CreatingState.tsx | 1 + .../tools/TLLineTool/states/CreatingState.tsx | 1 + .../tools/TLTextTool/states/CreatingState.tsx | 1 + tldraw/yarn.lock | 103 ++++++++++++++++-- 18 files changed, 208 insertions(+), 57 deletions(-) create mode 100644 tldraw/apps/tldraw-logseq/src/components/inputs/ScaleInput.tsx diff --git a/tldraw/apps/tldraw-logseq/package.json b/tldraw/apps/tldraw-logseq/package.json index 0a4179c50a..e8cac4cca0 100644 --- a/tldraw/apps/tldraw-logseq/package.json +++ b/tldraw/apps/tldraw-logseq/package.json @@ -13,7 +13,7 @@ "@radix-ui/react-context-menu": "^2.1.0", "@radix-ui/react-dropdown-menu": "^2.0.1", "@radix-ui/react-popover": "^1.0.0", - "@radix-ui/react-select": "^1.1.2", + "@radix-ui/react-select": "^1.2.1", "@radix-ui/react-separator": "^1.0.1", "@radix-ui/react-slider": "^1.1.0", "@radix-ui/react-switch": "^1.0.1", diff --git a/tldraw/apps/tldraw-logseq/src/components/ContextBar/contextBarActionFactory.tsx b/tldraw/apps/tldraw-logseq/src/components/ContextBar/contextBarActionFactory.tsx index 0adce381f6..6dc3de570f 100644 --- a/tldraw/apps/tldraw-logseq/src/components/ContextBar/contextBarActionFactory.tsx +++ b/tldraw/apps/tldraw-logseq/src/components/ContextBar/contextBarActionFactory.tsx @@ -19,7 +19,7 @@ import type { import { Button } from '../Button' import { TablerIcon } from '../icons' import { ColorInput } from '../inputs/ColorInput' -import { SelectInput, type SelectOption } from '../inputs/SelectInput' +import { ScaleInput } from '../inputs/ScaleInput' import { ShapeLinksInput } from '../inputs/ShapeLinksInput' import { TextInput } from '../inputs/TextInput' import { @@ -211,44 +211,9 @@ const ScaleLevelAction = observer(() => { const app = useApp() const shapes = filterShapeByAction(app.selectedShapesArray, 'ScaleLevel') const scaleLevel = new Set(shapes.map(s => s.scaleLevel)).size > 1 ? '' : shapes[0].scaleLevel - const sizeOptions: SelectOption[] = [ - { - label: isMobile() ? 'XS' : 'Extra Small', - value: 'xs', - }, - { - label: isMobile() ? 'SM' : 'Small', - value: 'sm', - }, - { - label: isMobile() ? 'MD' : 'Medium', - value: 'md', - }, - { - label: isMobile() ? 'LG' : 'Large', - value: 'lg', - }, - { - label: isMobile() ? 'XL' : 'Extra Large', - value: 'xl', - }, - { - label: isMobile() ? 'XXL' : 'Huge', - value: 'xxl', - }, - ] + return ( - { - shapes.forEach(shape => { - shape.setScaleLevel(v as LogseqPortalShape['props']['scaleLevel']) - }) - app.persist() - }} - /> + ) }) diff --git a/tldraw/apps/tldraw-logseq/src/components/PrimaryTools/PrimaryTools.tsx b/tldraw/apps/tldraw-logseq/src/components/PrimaryTools/PrimaryTools.tsx index b6872af9b5..cd16e4d83d 100644 --- a/tldraw/apps/tldraw-logseq/src/components/PrimaryTools/PrimaryTools.tsx +++ b/tldraw/apps/tldraw-logseq/src/components/PrimaryTools/PrimaryTools.tsx @@ -4,6 +4,7 @@ import * as React from 'react' import { ToolButton } from '../ToolButton' import { GeometryTools } from '../GeometryTools' import { ColorInput } from '../inputs/ColorInput' +import { ScaleInput } from '../inputs/ScaleInput' import * as Separator from '@radix-ui/react-separator' export const PrimaryTools = observer(function PrimaryTools() { @@ -36,6 +37,7 @@ export const PrimaryTools = observer(function PrimaryTools() { style={{ margin: '0 -4px' }} /> + ) diff --git a/tldraw/apps/tldraw-logseq/src/components/inputs/ScaleInput.tsx b/tldraw/apps/tldraw-logseq/src/components/inputs/ScaleInput.tsx new file mode 100644 index 0000000000..7b9626544f --- /dev/null +++ b/tldraw/apps/tldraw-logseq/src/components/inputs/ScaleInput.tsx @@ -0,0 +1,59 @@ +import { SelectInput, type SelectOption } from '../inputs/SelectInput' +import type { Side } from '@radix-ui/react-popper' +import type { SizeLevel } from '../../lib' +import { useApp } from '@tldraw/react' + +interface ScaleInputProps extends React.HTMLAttributes { + scaleLevel?: SizeLevel, + compact?: boolean, + popoverSide?: Side +} + +export function ScaleInput({ + scaleLevel, + compact, + popoverSide, + ...rest +}: ScaleInputProps) { + const app = useApp() + + const sizeOptions: SelectOption[] = [ + { + label: compact ? 'XS' : 'Extra Small', + value: 'xs', + }, + { + label: compact ? 'SM' : 'Small', + value: 'sm', + }, + { + label: compact ? 'MD' : 'Medium', + value: 'md', + }, + { + label: compact ? 'LG' : 'Large', + value: 'lg', + }, + { + label: compact ? 'XL' : 'Extra Large', + value: 'xl', + }, + { + label: compact ? 'XXL' : 'Huge', + value: 'xxl', + }, + ] + + return ( + { + app.api.setScaleLevel(v) + }} + /> + ) +} diff --git a/tldraw/apps/tldraw-logseq/src/components/inputs/SelectInput.tsx b/tldraw/apps/tldraw-logseq/src/components/inputs/SelectInput.tsx index c81b8f7ec3..c30520d3c5 100644 --- a/tldraw/apps/tldraw-logseq/src/components/inputs/SelectInput.tsx +++ b/tldraw/apps/tldraw-logseq/src/components/inputs/SelectInput.tsx @@ -2,6 +2,7 @@ import * as React from 'react' import * as Select from '@radix-ui/react-select' import { TablerIcon } from '../icons' import { Tooltip } from '../Tooltip' +import type { Side } from '@radix-ui/react-popper' export interface SelectOption { value: string @@ -11,11 +12,13 @@ export interface SelectOption { interface SelectInputProps extends React.HTMLAttributes { options: SelectOption[] value: string - tooltip?: React.ReactNode + tooltip?: React.ReactNode, + popoverSide?: Side, + chevron?: boolean, onValueChange: (value: string) => void } -export function SelectInput({ options, tooltip, value, onValueChange, ...rest }: SelectInputProps) { +export function SelectInput({ options, tooltip, popoverSide, chevron = true, value, onValueChange, ...rest }: SelectInputProps) { const [isOpen, setIsOpen] = React.useState(false) return (
@@ -25,19 +28,21 @@ export function SelectInput({ options, tooltip, value, onValueChange, ...rest }: value={value} onValueChange={onValueChange} > - +
- - - + {chevron && + + + + } - + {options.map(option => { diff --git a/tldraw/apps/tldraw-logseq/src/hooks/usePaste.ts b/tldraw/apps/tldraw-logseq/src/hooks/usePaste.ts index c11604c5e3..971d745d33 100644 --- a/tldraw/apps/tldraw-logseq/src/hooks/usePaste.ts +++ b/tldraw/apps/tldraw-logseq/src/hooks/usePaste.ts @@ -330,6 +330,7 @@ const handleCreatingShapes = async ( pageId: blockRef, fill: app.settings.color, stroke: app.settings.color, + scaleLevel: app.settings.scaleLevel, blockType: 'B' as 'B', }, ] @@ -346,6 +347,7 @@ const handleCreatingShapes = async ( pageId: pageName, fill: app.settings.color, stroke: app.settings.color, + scaleLevel: app.settings.scaleLevel, blockType: 'P' as 'P', }, ] @@ -370,6 +372,7 @@ const handleCreatingShapes = async ( pageId: uuid, fill: app.settings.color, stroke: app.settings.color, + scaleLevel: app.settings.scaleLevel, blockType: 'B' as 'B', compact: true, }, diff --git a/tldraw/apps/tldraw-logseq/src/lib/shapes/BoxShape.tsx b/tldraw/apps/tldraw-logseq/src/lib/shapes/BoxShape.tsx index 5e4a6094b7..fc8bd1d323 100644 --- a/tldraw/apps/tldraw-logseq/src/lib/shapes/BoxShape.tsx +++ b/tldraw/apps/tldraw-logseq/src/lib/shapes/BoxShape.tsx @@ -152,6 +152,7 @@ export class BoxShape extends TLBoxShape { this.update({ scaleLevel: v, fontSize: levelToScale[v ?? 'md'], + strokeWidth: levelToScale[v ?? 'md'] / 10, }) this.onResetBounds() } diff --git a/tldraw/apps/tldraw-logseq/src/lib/shapes/EllipseShape.tsx b/tldraw/apps/tldraw-logseq/src/lib/shapes/EllipseShape.tsx index 972426edd2..965c8bcc7c 100644 --- a/tldraw/apps/tldraw-logseq/src/lib/shapes/EllipseShape.tsx +++ b/tldraw/apps/tldraw-logseq/src/lib/shapes/EllipseShape.tsx @@ -146,6 +146,7 @@ export class EllipseShape extends TLEllipseShape { this.update({ scaleLevel: v, fontSize: levelToScale[v ?? 'md'], + strokeWidth: levelToScale[v ?? 'md'] / 10, }) this.onResetBounds() } diff --git a/tldraw/apps/tldraw-logseq/src/lib/shapes/PolygonShape.tsx b/tldraw/apps/tldraw-logseq/src/lib/shapes/PolygonShape.tsx index a62c9f959b..a3931b0e8c 100644 --- a/tldraw/apps/tldraw-logseq/src/lib/shapes/PolygonShape.tsx +++ b/tldraw/apps/tldraw-logseq/src/lib/shapes/PolygonShape.tsx @@ -160,6 +160,7 @@ export class PolygonShape extends TLPolygonShape { this.update({ scaleLevel: v, fontSize: levelToScale[v ?? 'md'], + strokeWidth: levelToScale[v ?? 'md'] / 10, }) this.onResetBounds() } diff --git a/tldraw/apps/tldraw-logseq/src/styles.css b/tldraw/apps/tldraw-logseq/src/styles.css index d6d402df09..5c41519888 100644 --- a/tldraw/apps/tldraw-logseq/src/styles.css +++ b/tldraw/apps/tldraw-logseq/src/styles.css @@ -301,6 +301,17 @@ html[data-theme='light'] { .tl-tools-floating-panel { flex-flow: column; + + .tl-select-input-trigger { + @apply p-0 text-xs; + + height: 32px; + min-width: 32px; + } + + .tl-select-input-trigger-value { + @apply font-semibold justify-center; + } } button.tl-select-input-trigger { @@ -314,7 +325,7 @@ button.tl-select-input-trigger { } .tl-select-input-trigger-value { - @apply flex items-center justify-start flex-1 mr-1 md:mr-3; + @apply flex items-center justify-start flex-1; } .tl-select-input-viewport { diff --git a/tldraw/packages/core/src/lib/TLApi/TLApi.ts b/tldraw/packages/core/src/lib/TLApi/TLApi.ts index 4d24eaa96a..2c42770391 100644 --- a/tldraw/packages/core/src/lib/TLApi/TLApi.ts +++ b/tldraw/packages/core/src/lib/TLApi/TLApi.ts @@ -181,6 +181,19 @@ export class TLApi { + const { settings } = this.app + + settings.update({ scaleLevel }) + + this.app.selectedShapes.forEach(shape => { + shape.setScaleLevel(scaleLevel) + }) + this.app.persist() + + return this + } + save = () => { this.app.save() return this diff --git a/tldraw/packages/core/src/lib/TLSettings.ts b/tldraw/packages/core/src/lib/TLSettings.ts index 467014faa1..e79b7d1408 100644 --- a/tldraw/packages/core/src/lib/TLSettings.ts +++ b/tldraw/packages/core/src/lib/TLSettings.ts @@ -5,6 +5,7 @@ export interface TLSettingsProps { mode: 'light' | 'dark' showGrid: boolean color: string + scaleLevel: string } export class TLSettings implements TLSettingsProps { @@ -14,6 +15,7 @@ export class TLSettings implements TLSettingsProps { @observable mode: 'dark' | 'light' = 'light' @observable showGrid = true + @observable scaleLevel = 'md' @observable color = '' @action update(props: Partial): void { diff --git a/tldraw/packages/core/src/lib/shapes/TLShape/TLShape.tsx b/tldraw/packages/core/src/lib/shapes/TLShape/TLShape.tsx index a68656bebe..39ff4d8d88 100644 --- a/tldraw/packages/core/src/lib/shapes/TLShape/TLShape.tsx +++ b/tldraw/packages/core/src/lib/shapes/TLShape/TLShape.tsx @@ -30,6 +30,7 @@ export interface TLShapeProps { name?: string fill?: string stroke?: string + scaleLevel?: string refs?: string[] // block id or page name point: number[] size?: number[] diff --git a/tldraw/packages/core/src/lib/tools/TLBoxTool/states/CreatingState.tsx b/tldraw/packages/core/src/lib/tools/TLBoxTool/states/CreatingState.tsx index f0f1e0baeb..2bdfbb04ed 100644 --- a/tldraw/packages/core/src/lib/tools/TLBoxTool/states/CreatingState.tsx +++ b/tldraw/packages/core/src/lib/tools/TLBoxTool/states/CreatingState.tsx @@ -58,6 +58,7 @@ export class CreatingState< this.initialBounds.maxY = this.initialBounds.minY + this.initialBounds.height } this.creatingShape = shape + this.creatingShape.setScaleLevel(this.app.settings.scaleLevel) this.app.currentPage.addShapes(shape as unknown as S) this.app.setSelectedShapes([shape as unknown as S]) } diff --git a/tldraw/packages/core/src/lib/tools/TLDrawTool/states/CreatingState.tsx b/tldraw/packages/core/src/lib/tools/TLDrawTool/states/CreatingState.tsx index 0cc929b0aa..e5688967f0 100644 --- a/tldraw/packages/core/src/lib/tools/TLDrawTool/states/CreatingState.tsx +++ b/tldraw/packages/core/src/lib/tools/TLDrawTool/states/CreatingState.tsx @@ -77,6 +77,7 @@ export class CreatingState< fill: this.app.settings.color, stroke: this.app.settings.color, }) + this.shape.setScaleLevel(this.app.settings.scaleLevel) this.app.currentPage.addShapes(this.shape) } } diff --git a/tldraw/packages/core/src/lib/tools/TLLineTool/states/CreatingState.tsx b/tldraw/packages/core/src/lib/tools/TLLineTool/states/CreatingState.tsx index 6ae9a3f913..d8e145b0ab 100644 --- a/tldraw/packages/core/src/lib/tools/TLLineTool/states/CreatingState.tsx +++ b/tldraw/packages/core/src/lib/tools/TLLineTool/states/CreatingState.tsx @@ -34,6 +34,7 @@ export class CreatingState< point: originPoint, fill: this.app.settings.color, stroke: this.app.settings.color, + scaleLevel: this.app.settings.scaleLevel, }) this.initialShape = toJS(shape.props) this.currentShape = shape diff --git a/tldraw/packages/core/src/lib/tools/TLTextTool/states/CreatingState.tsx b/tldraw/packages/core/src/lib/tools/TLTextTool/states/CreatingState.tsx index 3cd3925a6e..3ea6e0866c 100644 --- a/tldraw/packages/core/src/lib/tools/TLTextTool/states/CreatingState.tsx +++ b/tldraw/packages/core/src/lib/tools/TLTextTool/states/CreatingState.tsx @@ -40,6 +40,7 @@ export class CreatingState< stroke: this.app.settings.color, }) this.creatingShape = shape + this.creatingShape.setScaleLevel(this.app.settings.scaleLevel) transaction(() => { this.app.currentPage.addShapes(shape as unknown as S) const { bounds } = shape diff --git a/tldraw/yarn.lock b/tldraw/yarn.lock index 7fd9f1dc3e..1665bcc199 100644 --- a/tldraw/yarn.lock +++ b/tldraw/yarn.lock @@ -573,6 +573,14 @@ "@babel/runtime" "^7.13.10" "@radix-ui/react-primitive" "1.0.1" +"@radix-ui/react-arrow@1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@radix-ui/react-arrow/-/react-arrow-1.0.2.tgz#93b0ff95f65e2264a05b14ef1031ec798243dd6f" + integrity sha512-fqYwhhI9IarZ0ll2cUSfKuXHlJK0qE4AfnRrPBbRwEH/4mGQn04/QFGomLi8TXWIdv9WJk//KgGm+aDxVIr1wA== + dependencies: + "@babel/runtime" "^7.13.10" + "@radix-ui/react-primitive" "1.0.2" + "@radix-ui/react-collection@1.0.1": version "1.0.1" resolved "https://registry.yarnpkg.com/@radix-ui/react-collection/-/react-collection-1.0.1.tgz#259506f97c6703b36291826768d3c1337edd1de5" @@ -584,6 +592,17 @@ "@radix-ui/react-primitive" "1.0.1" "@radix-ui/react-slot" "1.0.1" +"@radix-ui/react-collection@1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@radix-ui/react-collection/-/react-collection-1.0.2.tgz#d50da00bfa2ac14585319efdbbb081d4c5a29a97" + integrity sha512-s8WdQQ6wNXpaxdZ308KSr8fEWGrg4un8i4r/w7fhiS4ElRNjk5rRcl0/C6TANG2LvLOGIxtzo/jAg6Qf73TEBw== + dependencies: + "@babel/runtime" "^7.13.10" + "@radix-ui/react-compose-refs" "1.0.0" + "@radix-ui/react-context" "1.0.0" + "@radix-ui/react-primitive" "1.0.2" + "@radix-ui/react-slot" "1.0.1" + "@radix-ui/react-compose-refs@1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@radix-ui/react-compose-refs/-/react-compose-refs-1.0.0.tgz#37595b1f16ec7f228d698590e78eeed18ff218ae" @@ -630,6 +649,18 @@ "@radix-ui/react-use-callback-ref" "1.0.0" "@radix-ui/react-use-escape-keydown" "1.0.2" +"@radix-ui/react-dismissable-layer@1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.0.3.tgz#63844d8e6bbcd010a513e7176d051c3c4044e09e" + integrity sha512-nXZOvFjOuHS1ovumntGV7NNoLaEp9JEvTht3MBjP44NSW5hUKj/8OnfN3+8WmB+CEhN44XaGhpHoSsUIEl5P7Q== + dependencies: + "@babel/runtime" "^7.13.10" + "@radix-ui/primitive" "1.0.0" + "@radix-ui/react-compose-refs" "1.0.0" + "@radix-ui/react-primitive" "1.0.2" + "@radix-ui/react-use-callback-ref" "1.0.0" + "@radix-ui/react-use-escape-keydown" "1.0.2" + "@radix-ui/react-dropdown-menu@^2.0.1": version "2.0.1" resolved "https://registry.yarnpkg.com/@radix-ui/react-dropdown-menu/-/react-dropdown-menu-2.0.1.tgz#dbc90676df7fb313d6b1eb204fdb434dbb724d15" @@ -661,6 +692,16 @@ "@radix-ui/react-primitive" "1.0.1" "@radix-ui/react-use-callback-ref" "1.0.0" +"@radix-ui/react-focus-scope@1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@radix-ui/react-focus-scope/-/react-focus-scope-1.0.2.tgz#5fe129cbdb5986d0a3ae16d14c473c243fe3bc79" + integrity sha512-spwXlNTfeIprt+kaEWE/qYuYT3ZAqJiAGjN/JgdvgVDTu8yc+HuX+WOWXrKliKnLnwck0F6JDkqIERncnih+4A== + dependencies: + "@babel/runtime" "^7.13.10" + "@radix-ui/react-compose-refs" "1.0.0" + "@radix-ui/react-primitive" "1.0.2" + "@radix-ui/react-use-callback-ref" "1.0.0" + "@radix-ui/react-id@1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@radix-ui/react-id/-/react-id-1.0.0.tgz#8d43224910741870a45a8c9d092f25887bb6d11e" @@ -732,6 +773,23 @@ "@radix-ui/react-use-size" "1.0.0" "@radix-ui/rect" "1.0.0" +"@radix-ui/react-popper@1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@radix-ui/react-popper/-/react-popper-1.1.1.tgz#54f060941c981e965ff5d6b64e152d6298d2326e" + integrity sha512-keYDcdMPNMjSC8zTsZ8wezUMiWM9Yj14wtF3s0PTIs9srnEPC9Kt2Gny1T3T81mmSeyDjZxsD9N5WCwNNb712w== + dependencies: + "@babel/runtime" "^7.13.10" + "@floating-ui/react-dom" "0.7.2" + "@radix-ui/react-arrow" "1.0.2" + "@radix-ui/react-compose-refs" "1.0.0" + "@radix-ui/react-context" "1.0.0" + "@radix-ui/react-primitive" "1.0.2" + "@radix-ui/react-use-callback-ref" "1.0.0" + "@radix-ui/react-use-layout-effect" "1.0.0" + "@radix-ui/react-use-rect" "1.0.0" + "@radix-ui/react-use-size" "1.0.0" + "@radix-ui/rect" "1.0.0" + "@radix-ui/react-portal@1.0.1": version "1.0.1" resolved "https://registry.yarnpkg.com/@radix-ui/react-portal/-/react-portal-1.0.1.tgz#169c5a50719c2bb0079cf4c91a27aa6d37e5dd33" @@ -740,6 +798,14 @@ "@babel/runtime" "^7.13.10" "@radix-ui/react-primitive" "1.0.1" +"@radix-ui/react-portal@1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@radix-ui/react-portal/-/react-portal-1.0.2.tgz#102370b1027a767a371cab0243be4bc664f72330" + integrity sha512-swu32idoCW7KA2VEiUZGBSu9nB6qwGdV6k6HYhUoOo3M1FFpD+VgLzUqtt3mwL1ssz7r2x8MggpLSQach2Xy/Q== + dependencies: + "@babel/runtime" "^7.13.10" + "@radix-ui/react-primitive" "1.0.2" + "@radix-ui/react-presence@1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@radix-ui/react-presence/-/react-presence-1.0.0.tgz#814fe46df11f9a468808a6010e3f3ca7e0b2e84a" @@ -757,6 +823,14 @@ "@babel/runtime" "^7.13.10" "@radix-ui/react-slot" "1.0.1" +"@radix-ui/react-primitive@1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@radix-ui/react-primitive/-/react-primitive-1.0.2.tgz#54e22f49ca59ba88d8143090276d50b93f8a7053" + integrity sha512-zY6G5Qq4R8diFPNwtyoLRZBxzu1Z+SXMlfYpChN7Dv8gvmx9X3qhDqiLWvKseKVJMuedFeU/Sa0Sy/Ia+t06Dw== + dependencies: + "@babel/runtime" "^7.13.10" + "@radix-ui/react-slot" "1.0.1" + "@radix-ui/react-roving-focus@1.0.1": version "1.0.1" resolved "https://registry.yarnpkg.com/@radix-ui/react-roving-focus/-/react-roving-focus-1.0.1.tgz#475621f63aee43faa183a5270f35d49e530de3d7" @@ -773,30 +847,31 @@ "@radix-ui/react-use-callback-ref" "1.0.0" "@radix-ui/react-use-controllable-state" "1.0.0" -"@radix-ui/react-select@^1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@radix-ui/react-select/-/react-select-1.1.2.tgz#675bb9c17970da74be95bd9804fdd2b9cf3a010b" - integrity sha512-pQmfz7T6oR5m27E3NgKOo6DLs5U1qMZaUcfTENXZnNPeyyRN8pEb6Z+xXE6zomP5sg9pgLOtir4R2Q3f2kkF9w== +"@radix-ui/react-select@^1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@radix-ui/react-select/-/react-select-1.2.1.tgz#0c8fadc9a134709036add7c9c7c8581e17962040" + integrity sha512-GULRMITaOHNj79BZvQs3iZO0+f2IgI8g5HDhMi7Bnc13t7IlG86NFtOCfTLme4PNZdEtU+no+oGgcl6IFiphpQ== dependencies: "@babel/runtime" "^7.13.10" "@radix-ui/number" "1.0.0" "@radix-ui/primitive" "1.0.0" - "@radix-ui/react-collection" "1.0.1" + "@radix-ui/react-collection" "1.0.2" "@radix-ui/react-compose-refs" "1.0.0" "@radix-ui/react-context" "1.0.0" "@radix-ui/react-direction" "1.0.0" - "@radix-ui/react-dismissable-layer" "1.0.2" + "@radix-ui/react-dismissable-layer" "1.0.3" "@radix-ui/react-focus-guards" "1.0.0" - "@radix-ui/react-focus-scope" "1.0.1" + "@radix-ui/react-focus-scope" "1.0.2" "@radix-ui/react-id" "1.0.0" - "@radix-ui/react-portal" "1.0.1" - "@radix-ui/react-primitive" "1.0.1" + "@radix-ui/react-popper" "1.1.1" + "@radix-ui/react-portal" "1.0.2" + "@radix-ui/react-primitive" "1.0.2" "@radix-ui/react-slot" "1.0.1" "@radix-ui/react-use-callback-ref" "1.0.0" "@radix-ui/react-use-controllable-state" "1.0.0" "@radix-ui/react-use-layout-effect" "1.0.0" "@radix-ui/react-use-previous" "1.0.0" - "@radix-ui/react-visually-hidden" "1.0.1" + "@radix-ui/react-visually-hidden" "1.0.2" aria-hidden "^1.1.1" react-remove-scroll "2.5.5" @@ -952,6 +1027,14 @@ "@babel/runtime" "^7.13.10" "@radix-ui/react-primitive" "1.0.1" +"@radix-ui/react-visually-hidden@1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.0.2.tgz#29b117a59ef09a984bdad12cb98d81e8350be450" + integrity sha512-qirnJxtYn73HEk1rXL12/mXnu2rwsNHDID10th2JGtdK25T9wX+mxRmGt7iPSahw512GbZOc0syZX1nLQGoEOg== + dependencies: + "@babel/runtime" "^7.13.10" + "@radix-ui/react-primitive" "1.0.2" + "@radix-ui/rect@1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@radix-ui/rect/-/rect-1.0.0.tgz#0dc8e6a829ea2828d53cbc94b81793ba6383bf3c"