From 6663ce13d5eba4cae09f7f3811d3f5950eaa69c0 Mon Sep 17 00:00:00 2001 From: Tamas Kovacs Date: Thu, 12 Mar 2026 14:20:43 +0100 Subject: [PATCH] fix(ui-many): fix imports of the multiversion support INSTUI-4953 --- .../ui-billboard/src/Billboard/v1/props.ts | 2 +- .../ui-billboard/src/Billboard/v2/props.ts | 2 +- .../src/Breadcrumb/v1/BreadcrumbLink/props.ts | 4 +- .../src/Breadcrumb/v2/BreadcrumbLink/props.ts | 2 +- .../ui-buttons/src/BaseButton/v1/index.tsx | 4 +- .../ui-buttons/src/BaseButton/v1/props.ts | 2 +- packages/ui-buttons/src/Button/v1/props.ts | 2 +- .../ui-buttons/src/CloseButton/v1/props.ts | 2 +- .../src/CondensedButton/v1/props.ts | 2 +- .../ui-buttons/src/IconButton/v1/props.ts | 2 +- .../ui-buttons/src/ToggleButton/v1/index.tsx | 2 +- .../ui-buttons/src/ToggleButton/v1/props.ts | 2 +- .../src/Byline/v1/__tests__/Byline.test.tsx | 2 +- packages/ui-byline/src/Byline/v1/index.tsx | 2 +- .../ui-calendar/src/Calendar/v1/Day/props.ts | 2 +- .../ui-calendar/src/Calendar/v1/index.tsx | 6 +- .../ui-calendar/src/Calendar/v2/Day/props.ts | 2 +- .../ui-calendar/src/Calendar/v2/index.tsx | 4 +- packages/ui-checkbox/src/Checkbox/v1/props.ts | 2 +- packages/ui-checkbox/src/Checkbox/v2/props.ts | 2 +- .../ui-checkbox/src/CheckboxGroup/v1/props.ts | 2 +- .../ui-checkbox/src/CheckboxGroup/v2/props.ts | 6 +- .../src/ColorContrast/v1/index.tsx | 8 +- .../src/ColorMixer/v1/ColorPalette/index.tsx | 4 +- .../src/ColorMixer/v1/RGBAInput/index.tsx | 2 +- .../src/ColorMixer/v1/Slider/index.tsx | 4 +- .../src/ColorPicker/v1/index.tsx | 10 +- .../src/ColorPicker/v1/props.ts | 2 +- .../src/ColorPreset/v1/index.tsx | 14 +-- .../ui-date-input/src/DateInput/v1/index.tsx | 4 +- .../ui-date-input/src/DateInput/v1/props.ts | 4 +- .../DateInput/v2/__tests__/DateInput.test.tsx | 2 +- .../ui-date-input/src/DateInput/v2/index.tsx | 2 +- .../ui-date-input/src/DateInput/v2/props.ts | 4 +- .../v1/__tests__/DateInput2.test.tsx | 2 +- .../ui-date-input/src/DateInput2/v1/index.tsx | 10 +- .../ui-date-input/src/DateInput2/v1/props.ts | 2 +- packages/ui-date-input/src/exports/b.ts | 2 +- .../src/DateTimeInput/v1/index.tsx | 12 +- .../src/DateTimeInput/v1/props.ts | 2 +- .../src/Drilldown/v1/DrilldownOption/props.ts | 2 +- .../Drilldown/v1/DrilldownSeparator/props.ts | 2 +- .../Drilldown/v1/__tests__/Drilldown.test.tsx | 2 +- .../ui-drilldown/src/Drilldown/v1/index.tsx | 8 +- .../ui-drilldown/src/Drilldown/v1/props.ts | 2 +- .../ui-editable/src/InPlaceEdit/v1/index.tsx | 8 +- .../ui-file-drop/src/FileDrop/v1/props.ts | 2 +- .../ui-file-drop/src/FileDrop/v2/props.ts | 2 +- .../ui-form-field/src/FormField/v1/README.md | 8 +- .../ui-form-field/src/FormField/v1/index.tsx | 9 +- .../ui-form-field/src/FormField/v1/props.ts | 17 +-- .../ui-form-field/src/FormField/v2/README.md | 43 ++++++++ .../{v1 => v2}/__tests__/FormField.test.tsx | 0 .../ui-form-field/src/FormField/v2/index.tsx | 87 +++++++++++++++ .../ui-form-field/src/FormField/v2/props.ts | 104 ++++++++++++++++++ .../src/FormFieldGroup/v1/index.tsx | 2 +- .../src/FormFieldGroup/v1/props.ts | 2 +- packages/ui-form-field/src/exports/b.ts | 4 +- packages/ui-img/src/Img/v1/index.tsx | 2 +- packages/ui-instructure/package.json | 20 ++-- .../src/DataPermissionLevels/v1/index.tsx | 10 +- .../src/NutritionFacts/v1/index.tsx | 10 +- packages/ui-instructure/src/exports/b.ts | 29 +++++ packages/ui-link/src/Link/v1/props.ts | 2 +- packages/ui-link/src/Link/v2/props.ts | 2 +- packages/ui-link/src/exports/b.ts | 4 +- .../ui-list/src/List/v1/ListItem/index.tsx | 2 +- packages/ui-list/src/List/v1/index.tsx | 2 +- .../ui-list/src/List/v2/ListItem/index.tsx | 2 +- packages/ui-list/src/List/v2/index.tsx | 2 +- packages/ui-menu/src/Menu/v1/props.ts | 2 +- .../src/Modal/v1/ModalHeader/index.tsx | 4 +- .../src/AppNav/v1/Item/index.tsx | 2 +- .../ui-navigation/src/AppNav/v1/index.tsx | 4 +- packages/ui-pages/src/Pages/v1/Page/index.tsx | 2 +- packages/ui-pages/src/Pages/v1/index.tsx | 2 +- .../v1/PaginationArrowButton/props.ts | 2 +- .../Pagination/v1/PaginationButton/props.ts | 2 +- .../v2/PaginationArrowButton/props.ts | 2 +- .../Pagination/v2/PaginationButton/props.ts | 2 +- packages/ui-popover/src/Popover/v1/index.tsx | 4 +- packages/ui-popover/src/exports/a.ts | 2 +- .../src/RadioInputGroup/v1/props.ts | 2 +- .../src/RadioInputGroup/v2/props.ts | 2 +- .../ui-range-input/src/RangeInput/v1/props.ts | 2 +- .../ui-range-input/src/RangeInput/v2/props.ts | 2 +- .../src/Rating/v1/__tests__/Rating.test.tsx | 2 +- packages/ui-rating/src/Rating/v1/index.tsx | 2 +- packages/ui-select/src/Select/v1/index.tsx | 14 +-- packages/ui-select/src/Select/v1/props.ts | 2 +- .../src/SimpleSelect/v1/index.tsx | 4 +- .../src/SimpleSelect/v1/props.ts | 4 +- .../src/SourceCodeEditor/v1/SearchPanel.tsx | 4 +- .../src/SourceCodeEditor/v2/SearchPanel.tsx | 2 +- packages/ui-tabs/src/Tabs/v1/Tab/props.ts | 2 +- packages/ui-tabs/src/Tabs/v1/props.ts | 2 +- packages/ui-tabs/src/Tabs/v2/Tab/props.ts | 2 +- packages/ui-tabs/src/Tabs/v2/props.ts | 2 +- packages/ui-tag/src/Tag/v1/props.ts | 2 +- packages/ui-tag/src/Tag/v2/props.ts | 2 +- .../ui-text-area/src/TextArea/v1/props.ts | 2 +- .../ui-text-area/src/TextArea/v2/props.ts | 2 +- .../ui-text-input/src/TextInput/v1/props.ts | 2 +- .../ui-text-input/src/TextInput/v2/props.ts | 2 +- .../src/TimeSelect/v1/index.tsx | 4 +- .../ui-time-select/src/TimeSelect/v1/props.ts | 2 +- packages/ui-toggle-details/package.json | 20 ++-- .../src/ToggleDetails/v1/props.ts | 2 +- .../src/ToggleDetails/v2/index.tsx | 2 +- .../src/ToggleDetails/v2/props.ts | 2 +- .../src/ToggleGroup/v1/index.tsx | 6 +- packages/ui-tooltip/src/Tooltip/v1/props.ts | 2 +- packages/ui-tooltip/src/Tooltip/v2/props.ts | 2 +- .../src/TopNavBar/v1/TopNavBarBrand/props.ts | 2 +- .../TopNavBar/v1/TopNavBarBreadcrumb/props.ts | 6 +- .../src/TopNavBar/v1/TopNavBarItem/props.ts | 12 +- .../SmallViewportLayout/index.tsx | 6 +- .../SmallViewportLayout/props.ts | 2 +- .../ui-top-nav-bar/src/TopNavBar/v1/index.tsx | 2 +- .../src/TopNavBar/v1/utils/exampleHelpers.tsx | 4 +- .../v1/utils/mapItemsForDrilldown.tsx | 4 +- 121 files changed, 477 insertions(+), 234 deletions(-) create mode 100644 packages/ui-form-field/src/FormField/v2/README.md rename packages/ui-form-field/src/FormField/{v1 => v2}/__tests__/FormField.test.tsx (100%) create mode 100644 packages/ui-form-field/src/FormField/v2/index.tsx create mode 100644 packages/ui-form-field/src/FormField/v2/props.ts create mode 100644 packages/ui-instructure/src/exports/b.ts diff --git a/packages/ui-billboard/src/Billboard/v1/props.ts b/packages/ui-billboard/src/Billboard/v1/props.ts index f1a6755902..07197f3296 100644 --- a/packages/ui-billboard/src/Billboard/v1/props.ts +++ b/packages/ui-billboard/src/Billboard/v1/props.ts @@ -32,7 +32,7 @@ import type { BillboardTheme, OtherHTMLAttributes } from '@instructure/shared-types' -import type { ViewProps } from '@instructure/ui-view' +import type { ViewProps } from '@instructure/ui-view/v11_6' import { MouseEvent } from 'react' import { Renderable } from '@instructure/shared-types' type HeroIconSize = 'medium' | 'x-large' | 'large' diff --git a/packages/ui-billboard/src/Billboard/v2/props.ts b/packages/ui-billboard/src/Billboard/v2/props.ts index b43946762c..852e7876c9 100644 --- a/packages/ui-billboard/src/Billboard/v2/props.ts +++ b/packages/ui-billboard/src/Billboard/v2/props.ts @@ -32,7 +32,7 @@ import type { BillboardTheme, OtherHTMLAttributes } from '@instructure/shared-types' -import type { ViewProps } from '@instructure/ui-view' +import type { ViewProps } from '@instructure/ui-view/latest' import { MouseEvent } from 'react' import { Renderable } from '@instructure/shared-types' type HeroIconSize = 'medium' | 'x-large' | 'large' diff --git a/packages/ui-breadcrumb/src/Breadcrumb/v1/BreadcrumbLink/props.ts b/packages/ui-breadcrumb/src/Breadcrumb/v1/BreadcrumbLink/props.ts index bf4d5bba2a..1bb4496318 100644 --- a/packages/ui-breadcrumb/src/Breadcrumb/v1/BreadcrumbLink/props.ts +++ b/packages/ui-breadcrumb/src/Breadcrumb/v1/BreadcrumbLink/props.ts @@ -28,8 +28,8 @@ import type { OtherHTMLAttributes, Renderable } from '@instructure/shared-types' -import type { ViewOwnProps } from '@instructure/ui-view' -import type { LinkProps } from '@instructure/ui-link' +import type { ViewOwnProps } from '@instructure/ui-view/v11_6' +import type { LinkProps } from '@instructure/ui-link/v11_6' type BreadcrumbLinkOwnProps = { /** diff --git a/packages/ui-breadcrumb/src/Breadcrumb/v2/BreadcrumbLink/props.ts b/packages/ui-breadcrumb/src/Breadcrumb/v2/BreadcrumbLink/props.ts index 9a4b0b3305..ff46883d19 100644 --- a/packages/ui-breadcrumb/src/Breadcrumb/v2/BreadcrumbLink/props.ts +++ b/packages/ui-breadcrumb/src/Breadcrumb/v2/BreadcrumbLink/props.ts @@ -28,7 +28,7 @@ import type { OtherHTMLAttributes, Renderable } from '@instructure/shared-types' -import type { ViewOwnProps } from '@instructure/ui-view' +import type { ViewOwnProps } from '@instructure/ui-view/latest' import type { LinkProps } from '@instructure/ui-link/latest' type BreadcrumbLinkOwnProps = { diff --git a/packages/ui-buttons/src/BaseButton/v1/index.tsx b/packages/ui-buttons/src/BaseButton/v1/index.tsx index 722fa74dba..80d6753cee 100644 --- a/packages/ui-buttons/src/BaseButton/v1/index.tsx +++ b/packages/ui-buttons/src/BaseButton/v1/index.tsx @@ -33,8 +33,8 @@ import { } from '@instructure/ui-react-utils' import { isActiveElement } from '@instructure/ui-dom-utils' import { hasVisibleChildren } from '@instructure/ui-a11y-utils' -import { View } from '@instructure/ui-view/latest' -import type { ViewProps } from '@instructure/ui-view/latest' +import { View } from '@instructure/ui-view/v11_6' +import type { ViewProps } from '@instructure/ui-view/v11_6' // TODO these have to be imported in separate lines because otherwise `isSafari` will be missing from the babel build // this bug is very likely caused by `babel-plugin-transform-imports` and can be reverted once it is removed from the codebase diff --git a/packages/ui-buttons/src/BaseButton/v1/props.ts b/packages/ui-buttons/src/BaseButton/v1/props.ts index 9a20f6c296..73ced57eb9 100644 --- a/packages/ui-buttons/src/BaseButton/v1/props.ts +++ b/packages/ui-buttons/src/BaseButton/v1/props.ts @@ -36,7 +36,7 @@ import type { OtherHTMLAttributes } from '@instructure/shared-types' import type { Cursor } from '@instructure/shared-types' -import type { ViewProps } from '@instructure/ui-view' +import type { ViewProps } from '@instructure/ui-view/v11_6' import { Renderable } from '@instructure/shared-types' type BaseButtonOwnProps = { diff --git a/packages/ui-buttons/src/Button/v1/props.ts b/packages/ui-buttons/src/Button/v1/props.ts index f139519679..5cdc359573 100644 --- a/packages/ui-buttons/src/Button/v1/props.ts +++ b/packages/ui-buttons/src/Button/v1/props.ts @@ -31,7 +31,7 @@ import type { OtherHTMLAttributes } from '@instructure/shared-types' import type { Cursor } from '@instructure/shared-types' -import type { ViewProps } from '@instructure/ui-view' +import type { ViewProps } from '@instructure/ui-view/v11_6' type ButtonOwnProps = { /** diff --git a/packages/ui-buttons/src/CloseButton/v1/props.ts b/packages/ui-buttons/src/CloseButton/v1/props.ts index b85a96d1ae..cc76b2df2d 100644 --- a/packages/ui-buttons/src/CloseButton/v1/props.ts +++ b/packages/ui-buttons/src/CloseButton/v1/props.ts @@ -35,7 +35,7 @@ import type { OtherHTMLAttributes } from '@instructure/shared-types' import type { Cursor } from '@instructure/shared-types' -import type { ViewProps } from '@instructure/ui-view' +import type { ViewProps } from '@instructure/ui-view/v11_6' type CloseButtonOwnProps = { /** diff --git a/packages/ui-buttons/src/CondensedButton/v1/props.ts b/packages/ui-buttons/src/CondensedButton/v1/props.ts index 954df0cd32..1687fb2623 100644 --- a/packages/ui-buttons/src/CondensedButton/v1/props.ts +++ b/packages/ui-buttons/src/CondensedButton/v1/props.ts @@ -31,7 +31,7 @@ import type { OtherHTMLAttributes } from '@instructure/shared-types' import type { Cursor } from '@instructure/shared-types' -import type { ViewProps } from '@instructure/ui-view' +import type { ViewProps } from '@instructure/ui-view/v11_6' type CondensedButtonOwnProps = { /** diff --git a/packages/ui-buttons/src/IconButton/v1/props.ts b/packages/ui-buttons/src/IconButton/v1/props.ts index aff5f68c27..a69bc9c5fa 100644 --- a/packages/ui-buttons/src/IconButton/v1/props.ts +++ b/packages/ui-buttons/src/IconButton/v1/props.ts @@ -33,7 +33,7 @@ import type { Renderable } from '@instructure/shared-types' import type { Cursor } from '@instructure/shared-types' -import type { ViewProps } from '@instructure/ui-view' +import type { ViewProps } from '@instructure/ui-view/v11_6' type IconButtonOwnProps = { /** diff --git a/packages/ui-buttons/src/ToggleButton/v1/index.tsx b/packages/ui-buttons/src/ToggleButton/v1/index.tsx index 1a4c333008..29d2c2fa61 100644 --- a/packages/ui-buttons/src/ToggleButton/v1/index.tsx +++ b/packages/ui-buttons/src/ToggleButton/v1/index.tsx @@ -26,7 +26,7 @@ import { Component } from 'react' import { callRenderProp, passthroughProps } from '@instructure/ui-react-utils' -import { Tooltip } from '@instructure/ui-tooltip/latest' +import { Tooltip } from '@instructure/ui-tooltip/v11_6' import { IconButton } from '../../IconButton/v1' import { allowedProps } from './props' diff --git a/packages/ui-buttons/src/ToggleButton/v1/props.ts b/packages/ui-buttons/src/ToggleButton/v1/props.ts index 66091f17ed..a62d1c932f 100644 --- a/packages/ui-buttons/src/ToggleButton/v1/props.ts +++ b/packages/ui-buttons/src/ToggleButton/v1/props.ts @@ -33,7 +33,7 @@ import type { PositionConstraint, PositionMountNode } from '@instructure/ui-position' -import type { ViewProps } from '@instructure/ui-view' +import type { ViewProps } from '@instructure/ui-view/v11_6' import { Renderable } from '@instructure/shared-types' type ToggleButtonOwnProps = { diff --git a/packages/ui-byline/src/Byline/v1/__tests__/Byline.test.tsx b/packages/ui-byline/src/Byline/v1/__tests__/Byline.test.tsx index c28da1820d..441adc9fab 100644 --- a/packages/ui-byline/src/Byline/v1/__tests__/Byline.test.tsx +++ b/packages/ui-byline/src/Byline/v1/__tests__/Byline.test.tsx @@ -30,7 +30,7 @@ import '@testing-library/jest-dom' import { Byline } from '../index' import { BylineProps } from '../props' import { runAxeCheck } from '@instructure/ui-axe-check' -import { View } from '@instructure/ui-view/latest' +import { View } from '@instructure/ui-view/v11_6' const TEST_TITLE = 'Test-title' const TEST_DESCRIPTION = 'Test-description' diff --git a/packages/ui-byline/src/Byline/v1/index.tsx b/packages/ui-byline/src/Byline/v1/index.tsx index 02979e2005..c2337f0620 100644 --- a/packages/ui-byline/src/Byline/v1/index.tsx +++ b/packages/ui-byline/src/Byline/v1/index.tsx @@ -25,7 +25,7 @@ import { Component } from 'react' import { omitProps } from '@instructure/ui-react-utils' -import { View } from '@instructure/ui-view/latest' +import { View } from '@instructure/ui-view/v11_6' import { withStyleLegacy as withStyle } from '@instructure/emotion' diff --git a/packages/ui-calendar/src/Calendar/v1/Day/props.ts b/packages/ui-calendar/src/Calendar/v1/Day/props.ts index 37463eb325..692dc49c0d 100644 --- a/packages/ui-calendar/src/Calendar/v1/Day/props.ts +++ b/packages/ui-calendar/src/Calendar/v1/Day/props.ts @@ -29,7 +29,7 @@ import type { } from '@instructure/shared-types' import type { WithStyleProps, ComponentStyle } from '@instructure/emotion' import { KeyboardEvent, MouseEvent } from 'react' -import type { ViewProps } from '@instructure/ui-view' +import type { ViewProps } from '@instructure/ui-view/v11_6' import { Renderable } from '@instructure/shared-types' type CalendarDayOwnProps = { diff --git a/packages/ui-calendar/src/Calendar/v1/index.tsx b/packages/ui-calendar/src/Calendar/v1/index.tsx index debfde6469..8d815e58cf 100644 --- a/packages/ui-calendar/src/Calendar/v1/index.tsx +++ b/packages/ui-calendar/src/Calendar/v1/index.tsx @@ -24,7 +24,7 @@ import { Children, Component, ReactElement, MouseEvent } from 'react' -import { View } from '@instructure/ui-view' +import { View } from '@instructure/ui-view/v11_6' import { safeCloneElement, callRenderProp, @@ -49,13 +49,13 @@ import { allowedProps } from './props' import type { CalendarProps, CalendarState } from './props' import { Renderable } from '@instructure/shared-types' -import { IconButton } from '@instructure/ui-buttons' +import { IconButton } from '@instructure/ui-buttons/v11_6' import { IconArrowOpenStartSolid, IconArrowOpenEndSolid } from '@instructure/ui-icons' -import { SimpleSelect } from '@instructure/ui-simple-select' +import { SimpleSelect } from '@instructure/ui-simple-select/v11_6' /** --- diff --git a/packages/ui-calendar/src/Calendar/v2/Day/props.ts b/packages/ui-calendar/src/Calendar/v2/Day/props.ts index 37463eb325..9925a48f98 100644 --- a/packages/ui-calendar/src/Calendar/v2/Day/props.ts +++ b/packages/ui-calendar/src/Calendar/v2/Day/props.ts @@ -29,7 +29,7 @@ import type { } from '@instructure/shared-types' import type { WithStyleProps, ComponentStyle } from '@instructure/emotion' import { KeyboardEvent, MouseEvent } from 'react' -import type { ViewProps } from '@instructure/ui-view' +import type { ViewProps } from '@instructure/ui-view/latest' import { Renderable } from '@instructure/shared-types' type CalendarDayOwnProps = { diff --git a/packages/ui-calendar/src/Calendar/v2/index.tsx b/packages/ui-calendar/src/Calendar/v2/index.tsx index 9e04870524..843bd7b125 100644 --- a/packages/ui-calendar/src/Calendar/v2/index.tsx +++ b/packages/ui-calendar/src/Calendar/v2/index.tsx @@ -24,7 +24,7 @@ import { Children, Component, ReactElement, MouseEvent } from 'react' -import { View } from '@instructure/ui-view' +import { View } from '@instructure/ui-view/latest' import { safeCloneElement, callRenderProp, @@ -54,7 +54,7 @@ import { ChevronRightInstUIIcon } from '@instructure/ui-icons' -import { SimpleSelect } from '@instructure/ui-simple-select' +import { SimpleSelect } from '@instructure/ui-simple-select/latest' /** --- diff --git a/packages/ui-checkbox/src/Checkbox/v1/props.ts b/packages/ui-checkbox/src/Checkbox/v1/props.ts index 41c2e5eb13..2bc8f02fce 100644 --- a/packages/ui-checkbox/src/Checkbox/v1/props.ts +++ b/packages/ui-checkbox/src/Checkbox/v1/props.ts @@ -22,7 +22,7 @@ * SOFTWARE. */ -import type { FormMessage } from '@instructure/ui-form-field' +import type { FormMessage } from '@instructure/ui-form-field/v11_6' import type { CheckboxFacadeTheme, OtherHTMLAttributes, diff --git a/packages/ui-checkbox/src/Checkbox/v2/props.ts b/packages/ui-checkbox/src/Checkbox/v2/props.ts index 41c2e5eb13..349de7069e 100644 --- a/packages/ui-checkbox/src/Checkbox/v2/props.ts +++ b/packages/ui-checkbox/src/Checkbox/v2/props.ts @@ -22,7 +22,7 @@ * SOFTWARE. */ -import type { FormMessage } from '@instructure/ui-form-field' +import type { FormMessage } from '@instructure/ui-form-field/latest' import type { CheckboxFacadeTheme, OtherHTMLAttributes, diff --git a/packages/ui-checkbox/src/CheckboxGroup/v1/props.ts b/packages/ui-checkbox/src/CheckboxGroup/v1/props.ts index 0a305f266d..7ce06351a9 100644 --- a/packages/ui-checkbox/src/CheckboxGroup/v1/props.ts +++ b/packages/ui-checkbox/src/CheckboxGroup/v1/props.ts @@ -23,7 +23,7 @@ */ import { type InputHTMLAttributes } from 'react' -import type { FormMessage } from '@instructure/ui-form-field' +import type { FormMessage } from '@instructure/ui-form-field/v11_6' import type { OtherHTMLAttributes } from '@instructure/shared-types' import type { WithDeterministicIdProps } from '@instructure/ui-react-utils' diff --git a/packages/ui-checkbox/src/CheckboxGroup/v2/props.ts b/packages/ui-checkbox/src/CheckboxGroup/v2/props.ts index 0a305f266d..f59913ba60 100644 --- a/packages/ui-checkbox/src/CheckboxGroup/v2/props.ts +++ b/packages/ui-checkbox/src/CheckboxGroup/v2/props.ts @@ -23,12 +23,12 @@ */ import { type InputHTMLAttributes } from 'react' -import type { FormMessage } from '@instructure/ui-form-field' +import type { FormMessage } from '@instructure/ui-form-field/latest' import type { OtherHTMLAttributes } from '@instructure/shared-types' import type { WithDeterministicIdProps } from '@instructure/ui-react-utils' -import { Checkbox } from '../../Checkbox/v1' -import type { CheckboxProps } from '../../Checkbox/v1/props' +import { Checkbox } from '../../Checkbox/v2' +import type { CheckboxProps } from '../../Checkbox/v2/props' type CheckboxChild = React.ComponentElement diff --git a/packages/ui-color-picker/src/ColorContrast/v1/index.tsx b/packages/ui-color-picker/src/ColorContrast/v1/index.tsx index edfabbe162..23c6d237c9 100644 --- a/packages/ui-color-picker/src/ColorContrast/v1/index.tsx +++ b/packages/ui-color-picker/src/ColorContrast/v1/index.tsx @@ -32,9 +32,9 @@ import { } from '@instructure/ui-color-utils' import { withStyleLegacy as withStyle } from '@instructure/emotion' -import { Text } from '@instructure/ui-text/latest' -import { Heading } from '@instructure/ui-heading/latest' -import { Pill } from '@instructure/ui-pill/latest' +import { Text } from '@instructure/ui-text/v11_6' +import { Heading } from '@instructure/ui-heading/v11_6' +import { Pill } from '@instructure/ui-pill/v11_6' import ColorIndicator from '../../ColorIndicator/v1' @@ -117,7 +117,7 @@ class ColorContrast extends Component { {description}
- + {pass ? successLabel : failureLabel}
diff --git a/packages/ui-color-picker/src/ColorMixer/v1/ColorPalette/index.tsx b/packages/ui-color-picker/src/ColorMixer/v1/ColorPalette/index.tsx index 1a8d7948ee..15f7ed8fb0 100644 --- a/packages/ui-color-picker/src/ColorMixer/v1/ColorPalette/index.tsx +++ b/packages/ui-color-picker/src/ColorMixer/v1/ColorPalette/index.tsx @@ -28,8 +28,8 @@ import { withStyleLegacy as withStyle } from '@instructure/emotion' import { addEventListener } from '@instructure/ui-dom-utils' import type { HSVType } from '@instructure/ui-color-utils' -import { View } from '@instructure/ui-view/latest' -import type { ViewOwnProps } from '@instructure/ui-view/latest' +import { View } from '@instructure/ui-view/v11_6' +import type { ViewOwnProps } from '@instructure/ui-view/v11_6' import { px } from '@instructure/ui-utils' import { withDeterministicId } from '@instructure/ui-react-utils' diff --git a/packages/ui-color-picker/src/ColorMixer/v1/RGBAInput/index.tsx b/packages/ui-color-picker/src/ColorMixer/v1/RGBAInput/index.tsx index d63ce98664..965bf9b53f 100644 --- a/packages/ui-color-picker/src/ColorMixer/v1/RGBAInput/index.tsx +++ b/packages/ui-color-picker/src/ColorMixer/v1/RGBAInput/index.tsx @@ -28,7 +28,7 @@ import { withStyleLegacy as withStyle } from '@instructure/emotion' import shallowCompare from '../utils/shallowCompare' import { ScreenReaderContent } from '@instructure/ui-a11y-content' -import { TextInput } from '@instructure/ui-text-input/latest' +import { TextInput } from '@instructure/ui-text-input/v11_6' import { allowedProps } from './props' import type { RGBAInputProps, RGBAInputState } from './props' diff --git a/packages/ui-color-picker/src/ColorMixer/v1/Slider/index.tsx b/packages/ui-color-picker/src/ColorMixer/v1/Slider/index.tsx index 2bb627b72f..3f888cd202 100644 --- a/packages/ui-color-picker/src/ColorMixer/v1/Slider/index.tsx +++ b/packages/ui-color-picker/src/ColorMixer/v1/Slider/index.tsx @@ -27,8 +27,8 @@ import { Component } from 'react' import { addEventListener } from '@instructure/ui-dom-utils' import { withStyleLegacy as withStyle } from '@instructure/emotion' -import { View } from '@instructure/ui-view/latest' -import type { ViewOwnProps } from '@instructure/ui-view/latest' +import { View } from '@instructure/ui-view/v11_6' +import type { ViewOwnProps } from '@instructure/ui-view/v11_6' import { allowedProps } from './props' import type { SliderProps, SliderStyleProps } from './props' diff --git a/packages/ui-color-picker/src/ColorPicker/v1/index.tsx b/packages/ui-color-picker/src/ColorPicker/v1/index.tsx index b2744d4579..de613cef66 100644 --- a/packages/ui-color-picker/src/ColorPicker/v1/index.tsx +++ b/packages/ui-color-picker/src/ColorPicker/v1/index.tsx @@ -32,17 +32,17 @@ import { warn, error } from '@instructure/console' import { omitProps } from '@instructure/ui-react-utils' import { isValid, contrast as getContrast } from '@instructure/ui-color-utils' import conversions from '@instructure/ui-color-utils' -import { TextInput } from '@instructure/ui-text-input/latest' -import { Tooltip } from '@instructure/ui-tooltip' -import { Button, IconButton } from '@instructure/ui-buttons/latest' -import { Popover } from '@instructure/ui-popover/latest' +import { TextInput } from '@instructure/ui-text-input/v11_6' +import { Tooltip } from '@instructure/ui-tooltip/v11_6' +import { Button, IconButton } from '@instructure/ui-buttons/v11_6' +import { Popover } from '@instructure/ui-popover/v11_6' import { IconCheckDarkLine, IconWarningLine, IconTroubleLine, IconInfoLine } from '@instructure/ui-icons' -import type { FormMessage } from '@instructure/ui-form-field/latest' +import type { FormMessage } from '@instructure/ui-form-field/v11_6' import ColorIndicator from '../../ColorIndicator/v1' import ColorMixer from '../../ColorMixer/v1' diff --git a/packages/ui-color-picker/src/ColorPicker/v1/props.ts b/packages/ui-color-picker/src/ColorPicker/v1/props.ts index acd94ad886..3fbc6d6054 100644 --- a/packages/ui-color-picker/src/ColorPicker/v1/props.ts +++ b/packages/ui-color-picker/src/ColorPicker/v1/props.ts @@ -23,7 +23,7 @@ */ import React from 'react' -import type { FormMessage } from '@instructure/ui-form-field' +import type { FormMessage } from '@instructure/ui-form-field/v11_6' import type { WithStyleProps, ComponentStyle, diff --git a/packages/ui-color-picker/src/ColorPreset/v1/index.tsx b/packages/ui-color-picker/src/ColorPreset/v1/index.tsx index 5b30752fd2..7fb56407c3 100644 --- a/packages/ui-color-picker/src/ColorPreset/v1/index.tsx +++ b/packages/ui-color-picker/src/ColorPreset/v1/index.tsx @@ -28,13 +28,13 @@ import { withStyleLegacy as withStyle } from '@instructure/emotion' import { omitProps } from '@instructure/ui-react-utils' import conversions from '@instructure/ui-color-utils' -import { IconButton, Button } from '@instructure/ui-buttons/latest' -import { View } from '@instructure/ui-view/latest' -import { Tooltip } from '@instructure/ui-tooltip/latest' -import { Popover } from '@instructure/ui-popover/latest' -import { Text } from '@instructure/ui-text/latest' -import { Drilldown } from '@instructure/ui-drilldown/latest' -import type { DrilldownProps } from '@instructure/ui-drilldown/latest' +import { IconButton, Button } from '@instructure/ui-buttons/v11_6' +import { View } from '@instructure/ui-view/v11_6' +import { Tooltip } from '@instructure/ui-tooltip/v11_6' +import { Popover } from '@instructure/ui-popover/v11_6' +import { Text } from '@instructure/ui-text/v11_6' +import { Drilldown } from '@instructure/ui-drilldown/v11_6' +import type { DrilldownProps } from '@instructure/ui-drilldown/v11_6' import { IconAddLine, IconCheckDarkSolid } from '@instructure/ui-icons' import { ColorIndicator } from '../../ColorIndicator/v1' diff --git a/packages/ui-date-input/src/DateInput/v1/index.tsx b/packages/ui-date-input/src/DateInput/v1/index.tsx index b8ebb3911b..b5993f37bf 100644 --- a/packages/ui-date-input/src/DateInput/v1/index.tsx +++ b/packages/ui-date-input/src/DateInput/v1/index.tsx @@ -30,7 +30,7 @@ import type { CalendarDayProps } from '@instructure/ui-calendar/v11_6' import { IconCalendarMonthLine } from '@instructure/ui-icons' -import { Popover } from '@instructure/ui-popover/latest' +import { Popover } from '@instructure/ui-popover/v11_6' import { Selectable } from '@instructure/ui-selectable' import type { SelectableProps, @@ -54,7 +54,7 @@ import generateStyle from './styles' import { allowedProps } from './props' import type { DateInputProps, DateInputState } from './props' -import type { FormMessage } from '@instructure/ui-form-field' +import type { FormMessage } from '@instructure/ui-form-field/v11_6' /** --- diff --git a/packages/ui-date-input/src/DateInput/v1/props.ts b/packages/ui-date-input/src/DateInput/v1/props.ts index 42ff242b68..ba45940387 100644 --- a/packages/ui-date-input/src/DateInput/v1/props.ts +++ b/packages/ui-date-input/src/DateInput/v1/props.ts @@ -22,8 +22,8 @@ * SOFTWARE. */ -import type { CalendarDayProps } from '@instructure/ui-calendar' -import type { FormMessage } from '@instructure/ui-form-field' +import type { CalendarDayProps } from '@instructure/ui-calendar/v11_6' +import type { FormMessage } from '@instructure/ui-form-field/v11_6' import type { PlacementPropValues } from '@instructure/ui-position' import type { Renderable, OtherHTMLAttributes } from '@instructure/shared-types' import type { WithStyleProps, ComponentStyle } from '@instructure/emotion' diff --git a/packages/ui-date-input/src/DateInput/v2/__tests__/DateInput.test.tsx b/packages/ui-date-input/src/DateInput/v2/__tests__/DateInput.test.tsx index b3d4e43704..bfb33937af 100644 --- a/packages/ui-date-input/src/DateInput/v2/__tests__/DateInput.test.tsx +++ b/packages/ui-date-input/src/DateInput/v2/__tests__/DateInput.test.tsx @@ -26,7 +26,7 @@ import { fireEvent, render, screen, waitFor } from '@testing-library/react' import { vi } from 'vitest' import userEvent from '@testing-library/user-event' import '@testing-library/jest-dom' -import { Calendar } from '@instructure/ui-calendar' +import { Calendar } from '@instructure/ui-calendar/latest' import { DateInput } from '../index' describe('', () => { diff --git a/packages/ui-date-input/src/DateInput/v2/index.tsx b/packages/ui-date-input/src/DateInput/v2/index.tsx index 5882adaf41..3eb9d46d3f 100644 --- a/packages/ui-date-input/src/DateInput/v2/index.tsx +++ b/packages/ui-date-input/src/DateInput/v2/index.tsx @@ -54,7 +54,7 @@ import generateStyle from './styles' import { allowedProps } from './props' import type { DateInputProps, DateInputState } from './props' -import type { FormMessage } from '@instructure/ui-form-field' +import type { FormMessage } from '@instructure/ui-form-field/latest' /** --- diff --git a/packages/ui-date-input/src/DateInput/v2/props.ts b/packages/ui-date-input/src/DateInput/v2/props.ts index 42ff242b68..613130bcea 100644 --- a/packages/ui-date-input/src/DateInput/v2/props.ts +++ b/packages/ui-date-input/src/DateInput/v2/props.ts @@ -22,8 +22,8 @@ * SOFTWARE. */ -import type { CalendarDayProps } from '@instructure/ui-calendar' -import type { FormMessage } from '@instructure/ui-form-field' +import type { CalendarDayProps } from '@instructure/ui-calendar/latest' +import type { FormMessage } from '@instructure/ui-form-field/latest' import type { PlacementPropValues } from '@instructure/ui-position' import type { Renderable, OtherHTMLAttributes } from '@instructure/shared-types' import type { WithStyleProps, ComponentStyle } from '@instructure/emotion' diff --git a/packages/ui-date-input/src/DateInput2/v1/__tests__/DateInput2.test.tsx b/packages/ui-date-input/src/DateInput2/v1/__tests__/DateInput2.test.tsx index 59a916b3d6..bad1577137 100644 --- a/packages/ui-date-input/src/DateInput2/v1/__tests__/DateInput2.test.tsx +++ b/packages/ui-date-input/src/DateInput2/v1/__tests__/DateInput2.test.tsx @@ -29,7 +29,7 @@ import '@testing-library/jest-dom' import { HeartInstUIIcon } from '@instructure/ui-icons' import { DateInput2 } from '../index' -import { TextInput } from '@instructure/ui-text-input/latest' +import { TextInput } from '@instructure/ui-text-input/v11_6' const LABEL_TEXT = 'Choose a date' diff --git a/packages/ui-date-input/src/DateInput2/v1/index.tsx b/packages/ui-date-input/src/DateInput2/v1/index.tsx index e162d82152..774987c31e 100644 --- a/packages/ui-date-input/src/DateInput2/v1/index.tsx +++ b/packages/ui-date-input/src/DateInput2/v1/index.tsx @@ -24,20 +24,20 @@ import { useState, useEffect, forwardRef, ForwardedRef } from 'react' import type { SyntheticEvent } from 'react' -import { Calendar } from '@instructure/ui-calendar/latest' -import { IconButton } from '@instructure/ui-buttons/latest' +import { Calendar } from '@instructure/ui-calendar/v11_6' +import { IconButton } from '@instructure/ui-buttons/v11_6' import { CalendarInstUIIcon, ChevronLeftInstUIIcon, ChevronRightInstUIIcon } from '@instructure/ui-icons' -import { Popover } from '@instructure/ui-popover/latest' -import { TextInput } from '@instructure/ui-text-input/latest' +import { Popover } from '@instructure/ui-popover/v11_6' +import { TextInput } from '@instructure/ui-text-input/v11_6' import { callRenderProp, passthroughProps } from '@instructure/ui-react-utils' import { getLocale, getTimezone } from '@instructure/ui-i18n' import type { DateInput2Props } from './props' -import type { FormMessage } from '@instructure/ui-form-field/latest' +import type { FormMessage } from '@instructure/ui-form-field/v11_6' import type { Moment } from '@instructure/ui-i18n' function parseLocaleDate( diff --git a/packages/ui-date-input/src/DateInput2/v1/props.ts b/packages/ui-date-input/src/DateInput2/v1/props.ts index 91cd982649..88b0ba91b6 100644 --- a/packages/ui-date-input/src/DateInput2/v1/props.ts +++ b/packages/ui-date-input/src/DateInput2/v1/props.ts @@ -23,7 +23,7 @@ */ import type { SyntheticEvent, InputHTMLAttributes } from 'react' -import type { FormMessage } from '@instructure/ui-form-field' +import type { FormMessage } from '@instructure/ui-form-field/v11_6' import type { OtherHTMLAttributes, Renderable } from '@instructure/shared-types' import type { Spacing } from '@instructure/emotion' diff --git a/packages/ui-date-input/src/exports/b.ts b/packages/ui-date-input/src/exports/b.ts index 85b0efc3ab..83b7a9ecf1 100644 --- a/packages/ui-date-input/src/exports/b.ts +++ b/packages/ui-date-input/src/exports/b.ts @@ -22,7 +22,7 @@ * SOFTWARE. */ -export { DateInput } from '../DateInput/v1' +export { DateInput } from '../DateInput/v2' export { DateInput2 } from '../DateInput2/v1' export type { DateInputProps } from '../DateInput/v2/props' export type { DateInput2Props } from '../DateInput2/v1/props' diff --git a/packages/ui-date-time-input/src/DateTimeInput/v1/index.tsx b/packages/ui-date-time-input/src/DateTimeInput/v1/index.tsx index c6c4f0106e..431d5e964d 100644 --- a/packages/ui-date-time-input/src/DateTimeInput/v1/index.tsx +++ b/packages/ui-date-time-input/src/DateTimeInput/v1/index.tsx @@ -25,14 +25,14 @@ import { Component, SyntheticEvent, MouseEvent } from 'react' import { Locale, DateTime, ApplyLocaleContext } from '@instructure/ui-i18n' import type { Moment } from '@instructure/ui-i18n' -import { FormFieldGroup } from '@instructure/ui-form-field/latest' -import type { FormMessage } from '@instructure/ui-form-field/latest' +import { FormFieldGroup } from '@instructure/ui-form-field/v11_6' +import type { FormMessage } from '@instructure/ui-form-field/v11_6' -import { DateInput } from '@instructure/ui-date-input/latest' -import { TimeSelect } from '@instructure/ui-time-select/latest' -import { Calendar } from '@instructure/ui-calendar/latest' +import { DateInput } from '@instructure/ui-date-input/v11_6' +import { TimeSelect } from '@instructure/ui-time-select/v11_6' +import { Calendar } from '@instructure/ui-calendar/v11_6' import { AccessibleContent } from '@instructure/ui-a11y-content' -import { IconButton } from '@instructure/ui-buttons/latest' +import { IconButton } from '@instructure/ui-buttons/v11_6' import { IconArrowOpenEndSolid, IconArrowOpenStartSolid diff --git a/packages/ui-date-time-input/src/DateTimeInput/v1/props.ts b/packages/ui-date-time-input/src/DateTimeInput/v1/props.ts index 8aaca544a1..2c59dcdcdd 100644 --- a/packages/ui-date-time-input/src/DateTimeInput/v1/props.ts +++ b/packages/ui-date-time-input/src/DateTimeInput/v1/props.ts @@ -23,7 +23,7 @@ */ import { SyntheticEvent } from 'react' -import type { FormMessage } from '@instructure/ui-form-field' +import type { FormMessage } from '@instructure/ui-form-field/v11_6' import type { InteractionType } from '@instructure/ui-react-utils' import type { Moment } from '@instructure/ui-i18n' import type { Renderable } from '@instructure/shared-types' diff --git a/packages/ui-drilldown/src/Drilldown/v1/DrilldownOption/props.ts b/packages/ui-drilldown/src/Drilldown/v1/DrilldownOption/props.ts index be7c1d7ad6..0df542f0a8 100644 --- a/packages/ui-drilldown/src/Drilldown/v1/DrilldownOption/props.ts +++ b/packages/ui-drilldown/src/Drilldown/v1/DrilldownOption/props.ts @@ -32,7 +32,7 @@ import type { WithStyleProps } from '@instructure/emotion' import type { OptionsItemRenderProps, OptionsItemProps -} from '@instructure/ui-options' +} from '@instructure/ui-options/v11_6' import Drilldown from '../index' import { Renderable } from '@instructure/shared-types' diff --git a/packages/ui-drilldown/src/Drilldown/v1/DrilldownSeparator/props.ts b/packages/ui-drilldown/src/Drilldown/v1/DrilldownSeparator/props.ts index 823d4f83e6..3761c36fd1 100644 --- a/packages/ui-drilldown/src/Drilldown/v1/DrilldownSeparator/props.ts +++ b/packages/ui-drilldown/src/Drilldown/v1/DrilldownSeparator/props.ts @@ -29,7 +29,7 @@ import type { OptionsSeparatorTheme } from '@instructure/shared-types' import type { WithStyleProps } from '@instructure/emotion' -import type { OptionsSeparatorProps } from '@instructure/ui-options' +import type { OptionsSeparatorProps } from '@instructure/ui-options/v11_6' type DrilldownSeparatorOwnProps = { id: string diff --git a/packages/ui-drilldown/src/Drilldown/v1/__tests__/Drilldown.test.tsx b/packages/ui-drilldown/src/Drilldown/v1/__tests__/Drilldown.test.tsx index 7fe1a02b1c..17927dda86 100644 --- a/packages/ui-drilldown/src/Drilldown/v1/__tests__/Drilldown.test.tsx +++ b/packages/ui-drilldown/src/Drilldown/v1/__tests__/Drilldown.test.tsx @@ -29,7 +29,7 @@ import '@testing-library/jest-dom' import { runAxeCheck } from '@instructure/ui-axe-check' import { IconCheckSolid } from '@instructure/ui-icons' -import { Popover } from '@instructure/ui-popover/latest' +import { Popover } from '@instructure/ui-popover/v11_6' import { Drilldown } from '../index' diff --git a/packages/ui-drilldown/src/Drilldown/v1/index.tsx b/packages/ui-drilldown/src/Drilldown/v1/index.tsx index ce5ba8d674..978a0aa4f2 100644 --- a/packages/ui-drilldown/src/Drilldown/v1/index.tsx +++ b/packages/ui-drilldown/src/Drilldown/v1/index.tsx @@ -35,14 +35,14 @@ import { withDeterministicId } from '@instructure/ui-react-utils' -import { View } from '@instructure/ui-view/latest' -import { Options } from '@instructure/ui-options' +import { View } from '@instructure/ui-view/v11_6' +import { Options } from '@instructure/ui-options/v11_6' import type { OptionsProps, OptionsItemProps, OptionsSeparatorProps -} from '@instructure/ui-options' -import { Popover } from '@instructure/ui-popover/latest' +} from '@instructure/ui-options/v11_6' +import { Popover } from '@instructure/ui-popover/v11_6' import { Selectable } from '@instructure/ui-selectable' import type { SelectableRender } from '@instructure/ui-selectable' import { diff --git a/packages/ui-drilldown/src/Drilldown/v1/props.ts b/packages/ui-drilldown/src/Drilldown/v1/props.ts index 34da6e9a27..d3aecc4ba0 100644 --- a/packages/ui-drilldown/src/Drilldown/v1/props.ts +++ b/packages/ui-drilldown/src/Drilldown/v1/props.ts @@ -24,7 +24,7 @@ import React from 'react' -import { Popover } from '@instructure/ui-popover/latest' +import { Popover } from '@instructure/ui-popover/v11_6' import type { WithStyleProps, ComponentStyle } from '@instructure/emotion' import type { WithDeterministicIdProps } from '@instructure/ui-react-utils' import type { diff --git a/packages/ui-editable/src/InPlaceEdit/v1/index.tsx b/packages/ui-editable/src/InPlaceEdit/v1/index.tsx index 4958be3c12..60fcb9e835 100644 --- a/packages/ui-editable/src/InPlaceEdit/v1/index.tsx +++ b/packages/ui-editable/src/InPlaceEdit/v1/index.tsx @@ -24,14 +24,14 @@ import { Component } from 'react' -import { Flex } from '@instructure/ui-flex' -import { IconButton } from '@instructure/ui-buttons' -import type { IconButtonProps } from '@instructure/ui-buttons' +import { Flex } from '@instructure/ui-flex/v11_6' +import { IconButton } from '@instructure/ui-buttons/v11_6' +import type { IconButtonProps } from '@instructure/ui-buttons/v11_6' import { IconEditLine } from '@instructure/ui-icons' import { logWarn as warn } from '@instructure/console' import { createChainedFunction } from '@instructure/ui-utils' import { withStyleLegacy as withStyle } from '@instructure/emotion' -import { View } from '@instructure/ui-view' +import { View } from '@instructure/ui-view/v11_6' import { Editable } from '../../Editable/v1' import generateStyle from './styles' diff --git a/packages/ui-file-drop/src/FileDrop/v1/props.ts b/packages/ui-file-drop/src/FileDrop/v1/props.ts index 6b59d02cae..8659238e1f 100644 --- a/packages/ui-file-drop/src/FileDrop/v1/props.ts +++ b/packages/ui-file-drop/src/FileDrop/v1/props.ts @@ -22,7 +22,7 @@ * SOFTWARE. */ -import type { FormMessage } from '@instructure/ui-form-field' +import type { FormMessage } from '@instructure/ui-form-field/v11_6' import type { Spacing, WithStyleProps, diff --git a/packages/ui-file-drop/src/FileDrop/v2/props.ts b/packages/ui-file-drop/src/FileDrop/v2/props.ts index 6b59d02cae..1462279c13 100644 --- a/packages/ui-file-drop/src/FileDrop/v2/props.ts +++ b/packages/ui-file-drop/src/FileDrop/v2/props.ts @@ -22,7 +22,7 @@ * SOFTWARE. */ -import type { FormMessage } from '@instructure/ui-form-field' +import type { FormMessage } from '@instructure/ui-form-field/latest' import type { Spacing, WithStyleProps, diff --git a/packages/ui-form-field/src/FormField/v1/README.md b/packages/ui-form-field/src/FormField/v1/README.md index a6d6648734..eb7802a677 100644 --- a/packages/ui-form-field/src/FormField/v1/README.md +++ b/packages/ui-form-field/src/FormField/v1/README.md @@ -11,25 +11,25 @@ type: example ---
+ messages={[{type:'success', text: 'This is a success message'}, {type:'newError', text: 'An error message. It will wrap if the text is longer than the width of the container.'}]}> test
+ messages={[{type:'success', text: 'This is a success message'}, {type:'newError', text: 'An error message. It will wrap if the text is longer than the width of the container.'}]}> test
+ messages={[{type:'success', text: 'success!'}, {type:'newError', text: 'An error message. It will wrap if the text is longer than the width of the container.'}]}> test
+ messages={[{type:'success', text: 'success!'}, {type:'newError', text: 'An error message. It will wrap if the text is longer than the width of the container.'}]}> test diff --git a/packages/ui-form-field/src/FormField/v1/index.tsx b/packages/ui-form-field/src/FormField/v1/index.tsx index 5ed2653263..6b97a5f6b2 100644 --- a/packages/ui-form-field/src/FormField/v1/index.tsx +++ b/packages/ui-form-field/src/FormField/v1/index.tsx @@ -26,9 +26,7 @@ import { Component } from 'react' import { omitProps, pickProps } from '@instructure/ui-react-utils' -import { allowedProps as formFieldLayoutAllowedProps } from '../../FormFieldLayout/v2/props' - -import { FormFieldLayout } from '../../FormFieldLayout/v2' +import { FormFieldLayout } from '../../FormFieldLayout/v1' import { allowedProps } from './props' import type { FormFieldProps } from './props' @@ -65,7 +63,7 @@ class FormField extends Component { return ( { htmlFor={this.props.id} elementRef={this.handleRef} margin={this.props.margin} - isRequired={this.props.isRequired} - disabled={this.props.disabled} - readOnly={this.props.readOnly} /> ) } diff --git a/packages/ui-form-field/src/FormField/v1/props.ts b/packages/ui-form-field/src/FormField/v1/props.ts index c40803d212..ee26552668 100644 --- a/packages/ui-form-field/src/FormField/v1/props.ts +++ b/packages/ui-form-field/src/FormField/v1/props.ts @@ -57,23 +57,11 @@ type FormFieldOwnProps = { * provides a reference to the underlying html root element */ elementRef?: (element: Element | null) => void - /** - * If `true`, displays an asterisk after the label to indicate the field is required - */ - isRequired?: boolean /** * Margin around the component. Accepts a `Spacing` token. See token values and example usage in [this guide](https://instructure.design/#layout-spacing). */ margin?: Spacing - /** - * Whether the field is disabled. When true, error and success messages will be hidden. - */ - disabled?: boolean - /** - * Whether the field is read-only. When true, error and success messages will be hidden. - */ - readOnly?: boolean } type PropKeys = keyof FormFieldOwnProps @@ -94,10 +82,7 @@ const allowedProps: AllowedPropKeys = [ 'width', 'inputContainerRef', 'elementRef', - 'isRequired', - 'margin', - 'disabled', - 'readOnly' + 'margin' ] export type { FormFieldOwnProps, FormFieldProps } diff --git a/packages/ui-form-field/src/FormField/v2/README.md b/packages/ui-form-field/src/FormField/v2/README.md new file mode 100644 index 0000000000..a6d6648734 --- /dev/null +++ b/packages/ui-form-field/src/FormField/v2/README.md @@ -0,0 +1,43 @@ +--- +describes: FormField +--- + +This is a helper component that is used by most of the custom form +components. In most cases it shouldn't be used directly. + +```js +--- +type: example +--- +
+ + + + test +
+ + + + test +
+ + + + test +
+ + + + test +
+ hidden text} width="400px" layout="stacked"> + + + test +
+
+``` diff --git a/packages/ui-form-field/src/FormField/v1/__tests__/FormField.test.tsx b/packages/ui-form-field/src/FormField/v2/__tests__/FormField.test.tsx similarity index 100% rename from packages/ui-form-field/src/FormField/v1/__tests__/FormField.test.tsx rename to packages/ui-form-field/src/FormField/v2/__tests__/FormField.test.tsx diff --git a/packages/ui-form-field/src/FormField/v2/index.tsx b/packages/ui-form-field/src/FormField/v2/index.tsx new file mode 100644 index 0000000000..5ed2653263 --- /dev/null +++ b/packages/ui-form-field/src/FormField/v2/index.tsx @@ -0,0 +1,87 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2015 - present Instructure, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +import { Component } from 'react' + +import { omitProps, pickProps } from '@instructure/ui-react-utils' + +import { allowedProps as formFieldLayoutAllowedProps } from '../../FormFieldLayout/v2/props' + +import { FormFieldLayout } from '../../FormFieldLayout/v2' + +import { allowedProps } from './props' +import type { FormFieldProps } from './props' + +/** +--- +category: components +--- +**/ +class FormField extends Component { + static readonly componentId = 'FormField' + + static allowedProps = allowedProps + static defaultProps = { + inline: false, + layout: 'stacked', + labelAlign: 'end', + vAlign: 'middle' + } + + ref: Element | null = null + + handleRef = (el: Element | null) => { + const { elementRef } = this.props + + this.ref = el + + if (typeof elementRef === 'function') { + elementRef(el) + } + } + + render() { + return ( + + ) + } +} + +export default FormField +export { FormField } diff --git a/packages/ui-form-field/src/FormField/v2/props.ts b/packages/ui-form-field/src/FormField/v2/props.ts new file mode 100644 index 0000000000..c40803d212 --- /dev/null +++ b/packages/ui-form-field/src/FormField/v2/props.ts @@ -0,0 +1,104 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2015 - present Instructure, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +import React from 'react' + +import type { OtherHTMLAttributes } from '@instructure/shared-types' +import type { FormMessage } from '../../utils/v1/FormPropTypes' +import type { Spacing } from '@instructure/emotion' + +type FormFieldOwnProps = { + label: React.ReactNode + /** + * the id of the input (to link it to its label for a11y). + * Applied as the `for` HTML prop on the label. + */ + id: string + /** + * Array of objects with shape: `{ + * text: React.ReactNode, + * type: One of: ['newError', 'error', 'hint', 'success', 'screenreader-only'] + * }` + */ + messages?: FormMessage[] + /** + * id for the form field messages + */ + messagesId?: string + children?: React.ReactNode + inline?: boolean + layout?: 'stacked' | 'inline' + labelAlign?: 'start' | 'end' + vAlign?: 'top' | 'middle' | 'bottom' + width?: string + inputContainerRef?: (element: HTMLSpanElement | null) => void + /** + * provides a reference to the underlying html root element + */ + elementRef?: (element: Element | null) => void + /** + * If `true`, displays an asterisk after the label to indicate the field is required + */ + isRequired?: boolean + + /** + * Margin around the component. Accepts a `Spacing` token. See token values and example usage in [this guide](https://instructure.design/#layout-spacing). + */ + margin?: Spacing + /** + * Whether the field is disabled. When true, error and success messages will be hidden. + */ + disabled?: boolean + /** + * Whether the field is read-only. When true, error and success messages will be hidden. + */ + readOnly?: boolean +} + +type PropKeys = keyof FormFieldOwnProps + +type AllowedPropKeys = Readonly> + +type FormFieldProps = FormFieldOwnProps & OtherHTMLAttributes +const allowedProps: AllowedPropKeys = [ + 'label', + 'id', + 'messages', + 'messagesId', + 'children', + 'inline', + 'layout', + 'labelAlign', + 'vAlign', + 'width', + 'inputContainerRef', + 'elementRef', + 'isRequired', + 'margin', + 'disabled', + 'readOnly' +] + +export type { FormFieldOwnProps, FormFieldProps } +export { allowedProps } diff --git a/packages/ui-form-field/src/FormFieldGroup/v1/index.tsx b/packages/ui-form-field/src/FormFieldGroup/v1/index.tsx index 5c38b7ccfd..7c001dd1dc 100644 --- a/packages/ui-form-field/src/FormFieldGroup/v1/index.tsx +++ b/packages/ui-form-field/src/FormFieldGroup/v1/index.tsx @@ -24,7 +24,7 @@ import { Component, Children, ReactElement, AriaAttributes } from 'react' -import { Grid } from '@instructure/ui-grid' +import { Grid } from '@instructure/ui-grid/v11_6' import { pickProps, omitProps } from '@instructure/ui-react-utils' import { withStyleLegacy as withStyle } from '@instructure/emotion' diff --git a/packages/ui-form-field/src/FormFieldGroup/v1/props.ts b/packages/ui-form-field/src/FormFieldGroup/v1/props.ts index 62fd6e7e11..bb32ffc4ee 100644 --- a/packages/ui-form-field/src/FormFieldGroup/v1/props.ts +++ b/packages/ui-form-field/src/FormFieldGroup/v1/props.ts @@ -28,7 +28,7 @@ import type { OtherHTMLAttributes } from '@instructure/shared-types' import type { WithStyleProps, ComponentStyle } from '@instructure/emotion' -import type { FormFieldLayoutOwnProps } from '../../FormFieldLayout/v2/props' +import type { FormFieldLayoutOwnProps } from '../../FormFieldLayout/v1/props' import type { FormMessage } from '../../utils/v1/FormPropTypes' type FormFieldGroupOwnProps = { diff --git a/packages/ui-form-field/src/exports/b.ts b/packages/ui-form-field/src/exports/b.ts index b1f487c388..8a98cdd249 100644 --- a/packages/ui-form-field/src/exports/b.ts +++ b/packages/ui-form-field/src/exports/b.ts @@ -22,7 +22,7 @@ * SOFTWARE. */ -export { FormField } from '../FormField/v1' +export { FormField } from '../FormField/v2' export { FormFieldLabel } from '../FormFieldLabel/v2' export { FormFieldMessage } from '../FormFieldMessage/v2' export { FormFieldMessages } from '../FormFieldMessages/v2' @@ -35,7 +35,7 @@ export type { FormMessageChild } from '../utils/v1/FormPropTypes' -export type { FormFieldOwnProps, FormFieldProps } from '../FormField/v1/props' +export type { FormFieldOwnProps, FormFieldProps } from '../FormField/v2/props' export type { FormFieldLabelProps } from '../FormFieldLabel/v2/props' export type { FormFieldMessageProps } from '../FormFieldMessage/v2/props' export type { FormFieldMessagesProps } from '../FormFieldMessages/v2/props' diff --git a/packages/ui-img/src/Img/v1/index.tsx b/packages/ui-img/src/Img/v1/index.tsx index 5b4d32b863..3934812856 100644 --- a/packages/ui-img/src/Img/v1/index.tsx +++ b/packages/ui-img/src/Img/v1/index.tsx @@ -24,7 +24,7 @@ import { Component } from 'react' -import { View } from '@instructure/ui-view/latest' +import { View } from '@instructure/ui-view/v11_6' import { passthroughProps } from '@instructure/ui-react-utils' import { withStyleLegacy as withStyle } from '@instructure/emotion' diff --git a/packages/ui-instructure/package.json b/packages/ui-instructure/package.json index cb50bfd670..55b059f319 100644 --- a/packages/ui-instructure/package.json +++ b/packages/ui-instructure/package.json @@ -73,18 +73,18 @@ "default": "./es/exports/a.js" }, "./v11_7": { - "src": "./src/exports/a.ts", - "types": "./types/exports/a.d.ts", - "import": "./es/exports/a.js", - "require": "./lib/exports/a.js", - "default": "./es/exports/a.js" + "src": "./src/exports/b.ts", + "types": "./types/exports/b.d.ts", + "import": "./es/exports/b.js", + "require": "./lib/exports/b.js", + "default": "./es/exports/b.js" }, "./latest": { - "src": "./src/exports/a.ts", - "types": "./types/exports/a.d.ts", - "import": "./es/exports/a.js", - "require": "./lib/exports/a.js", - "default": "./es/exports/a.js" + "src": "./src/exports/b.ts", + "types": "./types/exports/b.d.ts", + "import": "./es/exports/b.js", + "require": "./lib/exports/b.js", + "default": "./es/exports/b.js" } } } diff --git a/packages/ui-instructure/src/DataPermissionLevels/v1/index.tsx b/packages/ui-instructure/src/DataPermissionLevels/v1/index.tsx index 148debc57f..762207f4bc 100644 --- a/packages/ui-instructure/src/DataPermissionLevels/v1/index.tsx +++ b/packages/ui-instructure/src/DataPermissionLevels/v1/index.tsx @@ -22,11 +22,11 @@ * SOFTWARE. */ import { useState } from 'react' -import { Modal } from '@instructure/ui-modal/latest' -import { Button, CloseButton } from '@instructure/ui-buttons/latest' -import { Heading } from '@instructure/ui-heading/latest' -import { Text } from '@instructure/ui-text/latest' -import { Link } from '@instructure/ui-link/latest' +import { Modal } from '@instructure/ui-modal/v11_6' +import { Button, CloseButton } from '@instructure/ui-buttons/v11_6' +import { Heading } from '@instructure/ui-heading/v11_6' +import { Text } from '@instructure/ui-text/v11_6' +import { Link } from '@instructure/ui-link/v11_6' import { useStyleLegacy as useStyle } from '@instructure/emotion' import { DataPermissionLevelsProps } from './props' diff --git a/packages/ui-instructure/src/NutritionFacts/v1/index.tsx b/packages/ui-instructure/src/NutritionFacts/v1/index.tsx index 85e7673b44..78ce969c1a 100644 --- a/packages/ui-instructure/src/NutritionFacts/v1/index.tsx +++ b/packages/ui-instructure/src/NutritionFacts/v1/index.tsx @@ -22,11 +22,11 @@ * SOFTWARE. */ import { useState } from 'react' -import { Modal } from '@instructure/ui-modal/latest' -import { Button, CloseButton } from '@instructure/ui-buttons/latest' -import { Heading } from '@instructure/ui-heading/latest' -import { Text } from '@instructure/ui-text/latest' -import { Link } from '@instructure/ui-link/latest' +import { Modal } from '@instructure/ui-modal/v11_6' +import { Button, CloseButton } from '@instructure/ui-buttons/v11_6' +import { Heading } from '@instructure/ui-heading/v11_6' +import { Text } from '@instructure/ui-text/v11_6' +import { Link } from '@instructure/ui-link/v11_6' import { useStyleLegacy as useStyle } from '@instructure/emotion' import { NutritionFactsProps } from './props' diff --git a/packages/ui-instructure/src/exports/b.ts b/packages/ui-instructure/src/exports/b.ts new file mode 100644 index 0000000000..95f68616ae --- /dev/null +++ b/packages/ui-instructure/src/exports/b.ts @@ -0,0 +1,29 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2015 - present Instructure, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +export { NutritionFacts } from '../NutritionFacts/v1' +export { DataPermissionLevels } from '../DataPermissionLevels/v1' +export { AiInformation } from '../AiInformation/v2' +export type { NutritionFactsProps } from '../NutritionFacts/v1/props' +export type { DataPermissionLevelsProps } from '../DataPermissionLevels/v1/props' +export type { AiInformationProps } from '../AiInformation/v2/props' diff --git a/packages/ui-link/src/Link/v1/props.ts b/packages/ui-link/src/Link/v1/props.ts index c6d4c29caf..75908f6d02 100644 --- a/packages/ui-link/src/Link/v1/props.ts +++ b/packages/ui-link/src/Link/v1/props.ts @@ -34,7 +34,7 @@ import type { WithStyleProps, ComponentStyle } from '@instructure/emotion' -import type { ViewOwnProps } from '@instructure/ui-view' +import type { ViewOwnProps } from '@instructure/ui-view/v11_6' import { Renderable } from '@instructure/shared-types' type LinkOwnProps = { diff --git a/packages/ui-link/src/Link/v2/props.ts b/packages/ui-link/src/Link/v2/props.ts index 1f6bfe3253..feec4b6a22 100644 --- a/packages/ui-link/src/Link/v2/props.ts +++ b/packages/ui-link/src/Link/v2/props.ts @@ -34,7 +34,7 @@ import type { WithStyleProps, ComponentStyle } from '@instructure/emotion' -import type { ViewOwnProps } from '@instructure/ui-view' +import type { ViewOwnProps } from '@instructure/ui-view/latest' import { Renderable } from '@instructure/shared-types' type LinkOwnProps = { diff --git a/packages/ui-link/src/exports/b.ts b/packages/ui-link/src/exports/b.ts index 00bd1a637d..a45a6cae78 100644 --- a/packages/ui-link/src/exports/b.ts +++ b/packages/ui-link/src/exports/b.ts @@ -22,5 +22,5 @@ * SOFTWARE. */ -export { Link } from '../Link/v1' -export type { LinkProps } from '../Link/v1/props' +export { Link } from '../Link/v2' +export type { LinkProps } from '../Link/v2/props' diff --git a/packages/ui-list/src/List/v1/ListItem/index.tsx b/packages/ui-list/src/List/v1/ListItem/index.tsx index d08b4e69c7..7b7f3c85f7 100644 --- a/packages/ui-list/src/List/v1/ListItem/index.tsx +++ b/packages/ui-list/src/List/v1/ListItem/index.tsx @@ -24,7 +24,7 @@ import { Component } from 'react' -import { View } from '@instructure/ui-view' +import { View } from '@instructure/ui-view/v11_6' import { passthroughProps } from '@instructure/ui-react-utils' import { withStyleLegacy as withStyle } from '@instructure/emotion' diff --git a/packages/ui-list/src/List/v1/index.tsx b/packages/ui-list/src/List/v1/index.tsx index 9891094609..f3833b57c3 100644 --- a/packages/ui-list/src/List/v1/index.tsx +++ b/packages/ui-list/src/List/v1/index.tsx @@ -24,7 +24,7 @@ import { Children, Component, ReactElement } from 'react' -import { View } from '@instructure/ui-view' +import { View } from '@instructure/ui-view/v11_6' import { passthroughProps, safeCloneElement } from '@instructure/ui-react-utils' import { ListItem } from './ListItem' diff --git a/packages/ui-list/src/List/v2/ListItem/index.tsx b/packages/ui-list/src/List/v2/ListItem/index.tsx index c1b26aaf47..55f8114b29 100644 --- a/packages/ui-list/src/List/v2/ListItem/index.tsx +++ b/packages/ui-list/src/List/v2/ListItem/index.tsx @@ -24,7 +24,7 @@ import { Component } from 'react' -import { View } from '@instructure/ui-view' +import { View } from '@instructure/ui-view/latest' import { passthroughProps } from '@instructure/ui-react-utils' import { withStyle } from '@instructure/emotion' diff --git a/packages/ui-list/src/List/v2/index.tsx b/packages/ui-list/src/List/v2/index.tsx index 45a8fa181f..f5139b20fc 100644 --- a/packages/ui-list/src/List/v2/index.tsx +++ b/packages/ui-list/src/List/v2/index.tsx @@ -24,7 +24,7 @@ import { Children, Component, ReactElement } from 'react' -import { View } from '@instructure/ui-view' +import { View } from '@instructure/ui-view/latest' import { passthroughProps, safeCloneElement } from '@instructure/ui-react-utils' import { withStyle } from '@instructure/emotion' diff --git a/packages/ui-menu/src/Menu/v1/props.ts b/packages/ui-menu/src/Menu/v1/props.ts index c3032e12ff..3003d9913d 100644 --- a/packages/ui-menu/src/Menu/v1/props.ts +++ b/packages/ui-menu/src/Menu/v1/props.ts @@ -31,7 +31,7 @@ import type { PositionConstraint, PositionMountNode } from '@instructure/ui-position' -import type { Popover } from '@instructure/ui-popover' +import type { Popover } from '@instructure/ui-popover/v11_6' import type { WithDeterministicIdProps } from '@instructure/ui-react-utils' import { MenuItem } from './MenuItem' diff --git a/packages/ui-modal/src/Modal/v1/ModalHeader/index.tsx b/packages/ui-modal/src/Modal/v1/ModalHeader/index.tsx index c8aada0b2f..474a06e064 100644 --- a/packages/ui-modal/src/Modal/v1/ModalHeader/index.tsx +++ b/packages/ui-modal/src/Modal/v1/ModalHeader/index.tsx @@ -31,8 +31,8 @@ import { import { withStyleLegacy as withStyle } from '@instructure/emotion' -import { CloseButton } from '@instructure/ui-buttons' -import type { CloseButtonProps } from '@instructure/ui-buttons' +import { CloseButton } from '@instructure/ui-buttons/v11_6' +import type { CloseButtonProps } from '@instructure/ui-buttons/v11_6' import generateStyle from './styles' import generateComponentTheme from './theme' diff --git a/packages/ui-navigation/src/AppNav/v1/Item/index.tsx b/packages/ui-navigation/src/AppNav/v1/Item/index.tsx index 58a47185ba..ca3b3c4ffa 100644 --- a/packages/ui-navigation/src/AppNav/v1/Item/index.tsx +++ b/packages/ui-navigation/src/AppNav/v1/Item/index.tsx @@ -32,7 +32,7 @@ import { passthroughProps } from '@instructure/ui-react-utils' -import { View } from '@instructure/ui-view' +import { View } from '@instructure/ui-view/v11_6' import { ScreenReaderContent } from '@instructure/ui-a11y-content' import type { ScreenReaderContentProps } from '@instructure/ui-a11y-content' diff --git a/packages/ui-navigation/src/AppNav/v1/index.tsx b/packages/ui-navigation/src/AppNav/v1/index.tsx index 2f03723124..29358bffcf 100644 --- a/packages/ui-navigation/src/AppNav/v1/index.tsx +++ b/packages/ui-navigation/src/AppNav/v1/index.tsx @@ -28,8 +28,8 @@ import { withStyleLegacy as withStyle } from '@instructure/emotion' import { callRenderProp, omitProps } from '@instructure/ui-react-utils' -import { View } from '@instructure/ui-view/latest' -import { Menu } from '@instructure/ui-menu/latest' +import { View } from '@instructure/ui-view/v11_6' +import { Menu } from '@instructure/ui-menu/v11_6' import { Item } from './Item' import generateStyle from './styles' diff --git a/packages/ui-pages/src/Pages/v1/Page/index.tsx b/packages/ui-pages/src/Pages/v1/Page/index.tsx index f7777e3a10..4f28b57f50 100644 --- a/packages/ui-pages/src/Pages/v1/Page/index.tsx +++ b/packages/ui-pages/src/Pages/v1/Page/index.tsx @@ -26,7 +26,7 @@ import { Component } from 'react' import { findDOMNode, findTabbable } from '@instructure/ui-dom-utils' import { logError as error } from '@instructure/console' -import { View } from '@instructure/ui-view/latest' +import { View } from '@instructure/ui-view/v11_6' import { PagesContext } from '../PagesContext' diff --git a/packages/ui-pages/src/Pages/v1/index.tsx b/packages/ui-pages/src/Pages/v1/index.tsx index b3d54f6bb6..54e0910647 100644 --- a/packages/ui-pages/src/Pages/v1/index.tsx +++ b/packages/ui-pages/src/Pages/v1/index.tsx @@ -24,7 +24,7 @@ import { Children, Component, ReactElement } from 'react' -import { View } from '@instructure/ui-view/latest' +import { View } from '@instructure/ui-view/v11_6' import { containsActiveElement, findTabbable } from '@instructure/ui-dom-utils' import { safeCloneElement, diff --git a/packages/ui-pagination/src/Pagination/v1/PaginationArrowButton/props.ts b/packages/ui-pagination/src/Pagination/v1/PaginationArrowButton/props.ts index 44a3d95093..10b670f543 100644 --- a/packages/ui-pagination/src/Pagination/v1/PaginationArrowButton/props.ts +++ b/packages/ui-pagination/src/Pagination/v1/PaginationArrowButton/props.ts @@ -27,7 +27,7 @@ import type { OtherHTMLAttributes, PickPropsWithExceptions } from '@instructure/shared-types' -import type { IconButtonProps } from '@instructure/ui-buttons' +import type { IconButtonProps } from '@instructure/ui-buttons/v11_6' type PaginationArrowDirections = 'first' | 'prev' | 'next' | 'last' diff --git a/packages/ui-pagination/src/Pagination/v1/PaginationButton/props.ts b/packages/ui-pagination/src/Pagination/v1/PaginationButton/props.ts index 3de4e11589..ded01ea52d 100644 --- a/packages/ui-pagination/src/Pagination/v1/PaginationButton/props.ts +++ b/packages/ui-pagination/src/Pagination/v1/PaginationButton/props.ts @@ -27,7 +27,7 @@ import type { OtherHTMLAttributes, PickPropsWithExceptions } from '@instructure/shared-types' -import type { BaseButtonProps } from '@instructure/ui-buttons' +import type { BaseButtonProps } from '@instructure/ui-buttons/v11_6' type PaginationPageOwnProps = { /** diff --git a/packages/ui-pagination/src/Pagination/v2/PaginationArrowButton/props.ts b/packages/ui-pagination/src/Pagination/v2/PaginationArrowButton/props.ts index 44a3d95093..a4baca6fa3 100644 --- a/packages/ui-pagination/src/Pagination/v2/PaginationArrowButton/props.ts +++ b/packages/ui-pagination/src/Pagination/v2/PaginationArrowButton/props.ts @@ -27,7 +27,7 @@ import type { OtherHTMLAttributes, PickPropsWithExceptions } from '@instructure/shared-types' -import type { IconButtonProps } from '@instructure/ui-buttons' +import type { IconButtonProps } from '@instructure/ui-buttons/latest' type PaginationArrowDirections = 'first' | 'prev' | 'next' | 'last' diff --git a/packages/ui-pagination/src/Pagination/v2/PaginationButton/props.ts b/packages/ui-pagination/src/Pagination/v2/PaginationButton/props.ts index 3de4e11589..93f1d20da7 100644 --- a/packages/ui-pagination/src/Pagination/v2/PaginationButton/props.ts +++ b/packages/ui-pagination/src/Pagination/v2/PaginationButton/props.ts @@ -27,7 +27,7 @@ import type { OtherHTMLAttributes, PickPropsWithExceptions } from '@instructure/shared-types' -import type { BaseButtonProps } from '@instructure/ui-buttons' +import type { BaseButtonProps } from '@instructure/ui-buttons/latest' type PaginationPageOwnProps = { /** diff --git a/packages/ui-popover/src/Popover/v1/index.tsx b/packages/ui-popover/src/Popover/v1/index.tsx index c2e75841f4..527ad51d72 100644 --- a/packages/ui-popover/src/Popover/v1/index.tsx +++ b/packages/ui-popover/src/Popover/v1/index.tsx @@ -64,8 +64,8 @@ import { withStyleLegacy as withStyle } from '@instructure/emotion' import generateStyle from './styles' import generateComponentTheme from './theme' -import type { PopoverProps, PopoverState } from '../v2/props' -import { allowedProps } from '../v2/props' +import type { PopoverProps, PopoverState } from '../v1/props' +import { allowedProps } from '../v1/props' import type { Renderable } from '@instructure/shared-types' /** --- diff --git a/packages/ui-popover/src/exports/a.ts b/packages/ui-popover/src/exports/a.ts index 00a83c16f3..c3fa5ba37b 100644 --- a/packages/ui-popover/src/exports/a.ts +++ b/packages/ui-popover/src/exports/a.ts @@ -22,4 +22,4 @@ * SOFTWARE. */ export { Popover } from '../Popover/v1' -export type { PopoverOwnProps, PopoverProps } from '../Popover/v2/props' +export type { PopoverOwnProps, PopoverProps } from '../Popover/v1/props' diff --git a/packages/ui-radio-input/src/RadioInputGroup/v1/props.ts b/packages/ui-radio-input/src/RadioInputGroup/v1/props.ts index cae9e6f354..0dd77243bd 100644 --- a/packages/ui-radio-input/src/RadioInputGroup/v1/props.ts +++ b/packages/ui-radio-input/src/RadioInputGroup/v1/props.ts @@ -25,7 +25,7 @@ import React from 'react' import type { WithStyleProps, ComponentStyle } from '@instructure/emotion' -import type { FormMessage } from '@instructure/ui-form-field' +import type { FormMessage } from '@instructure/ui-form-field/v11_6' import type { OtherHTMLAttributes, RadioInputGroupTheme diff --git a/packages/ui-radio-input/src/RadioInputGroup/v2/props.ts b/packages/ui-radio-input/src/RadioInputGroup/v2/props.ts index c28fc829c8..33ddd9556e 100644 --- a/packages/ui-radio-input/src/RadioInputGroup/v2/props.ts +++ b/packages/ui-radio-input/src/RadioInputGroup/v2/props.ts @@ -24,7 +24,7 @@ import React from 'react' -import type { FormMessage } from '@instructure/ui-form-field' +import type { FormMessage } from '@instructure/ui-form-field/latest' import type { OtherHTMLAttributes } from '@instructure/shared-types' import type { WithDeterministicIdProps } from '@instructure/ui-react-utils' diff --git a/packages/ui-range-input/src/RangeInput/v1/props.ts b/packages/ui-range-input/src/RangeInput/v1/props.ts index 296a75c7a6..826d73bd05 100644 --- a/packages/ui-range-input/src/RangeInput/v1/props.ts +++ b/packages/ui-range-input/src/RangeInput/v1/props.ts @@ -29,7 +29,7 @@ import type { RangeInputTheme, PickPropsWithExceptions } from '@instructure/shared-types' -import type { FormFieldOwnProps, FormMessage } from '@instructure/ui-form-field' +import type { FormFieldOwnProps, FormMessage } from '@instructure/ui-form-field/v11_6' import type { WithStyleProps, ComponentStyle } from '@instructure/emotion' import type { InputHTMLAttributes } from 'react' import type { WithDeterministicIdProps } from '@instructure/ui-react-utils' diff --git a/packages/ui-range-input/src/RangeInput/v2/props.ts b/packages/ui-range-input/src/RangeInput/v2/props.ts index 296a75c7a6..f5a8c76486 100644 --- a/packages/ui-range-input/src/RangeInput/v2/props.ts +++ b/packages/ui-range-input/src/RangeInput/v2/props.ts @@ -29,7 +29,7 @@ import type { RangeInputTheme, PickPropsWithExceptions } from '@instructure/shared-types' -import type { FormFieldOwnProps, FormMessage } from '@instructure/ui-form-field' +import type { FormFieldOwnProps, FormMessage } from '@instructure/ui-form-field/latest' import type { WithStyleProps, ComponentStyle } from '@instructure/emotion' import type { InputHTMLAttributes } from 'react' import type { WithDeterministicIdProps } from '@instructure/ui-react-utils' diff --git a/packages/ui-rating/src/Rating/v1/__tests__/Rating.test.tsx b/packages/ui-rating/src/Rating/v1/__tests__/Rating.test.tsx index b9da9909e6..09a4d8341c 100644 --- a/packages/ui-rating/src/Rating/v1/__tests__/Rating.test.tsx +++ b/packages/ui-rating/src/Rating/v1/__tests__/Rating.test.tsx @@ -27,7 +27,7 @@ import { vi } from 'vitest' import '@testing-library/jest-dom' import { runAxeCheck } from '@instructure/ui-axe-check' -import { View } from '@instructure/ui-view/latest' +import { View } from '@instructure/ui-view/v11_6' import { Rating } from '../index' diff --git a/packages/ui-rating/src/Rating/v1/index.tsx b/packages/ui-rating/src/Rating/v1/index.tsx index d5b03d1bd1..37594bcf60 100644 --- a/packages/ui-rating/src/Rating/v1/index.tsx +++ b/packages/ui-rating/src/Rating/v1/index.tsx @@ -24,7 +24,7 @@ import { Component } from 'react' -import { View } from '@instructure/ui-view/latest' +import { View } from '@instructure/ui-view/v11_6' import { ScreenReaderContent } from '@instructure/ui-a11y-content' import { omitProps } from '@instructure/ui-react-utils' import { RatingIcon } from '../../RatingIcon/v1' diff --git a/packages/ui-select/src/Select/v1/index.tsx b/packages/ui-select/src/Select/v1/index.tsx index 26c3edd858..b452b2af2d 100644 --- a/packages/ui-select/src/Select/v1/index.tsx +++ b/packages/ui-select/src/Select/v1/index.tsx @@ -37,23 +37,23 @@ import { isActiveElement } from '@instructure/ui-dom-utils' -import { View } from '@instructure/ui-view/latest' +import { View } from '@instructure/ui-view/v11_6' import { Selectable } from '@instructure/ui-selectable' -import { Popover } from '@instructure/ui-popover/latest' -import { TextInput } from '@instructure/ui-text-input/latest' -import { Options } from '@instructure/ui-options' +import { Popover } from '@instructure/ui-popover/v11_6' +import { TextInput } from '@instructure/ui-text-input/v11_6' +import { Options } from '@instructure/ui-options/v11_6' import { IconArrowOpenDownLine, IconArrowOpenUpLine } from '@instructure/ui-icons' -import type { ViewProps } from '@instructure/ui-view/latest' -import type { TextInputProps } from '@instructure/ui-text-input/latest' +import type { ViewProps } from '@instructure/ui-view/v11_6' +import type { TextInputProps } from '@instructure/ui-text-input/v11_6' import type { OptionsItemProps, OptionsSeparatorProps, OptionsItemRenderProps -} from '@instructure/ui-options' +} from '@instructure/ui-options/v11_6' import type { SelectableProps, SelectableRender diff --git a/packages/ui-select/src/Select/v1/props.ts b/packages/ui-select/src/Select/v1/props.ts index 92304fe99f..d5a88271e9 100644 --- a/packages/ui-select/src/Select/v1/props.ts +++ b/packages/ui-select/src/Select/v1/props.ts @@ -28,7 +28,7 @@ import type { OtherHTMLAttributes, SelectTheme } from '@instructure/shared-types' -import type { FormMessage } from '@instructure/ui-form-field' +import type { FormMessage } from '@instructure/ui-form-field/v11_6' import type { WithStyleProps, ComponentStyle } from '@instructure/emotion' import type { PlacementPropValues, diff --git a/packages/ui-simple-select/src/SimpleSelect/v1/index.tsx b/packages/ui-simple-select/src/SimpleSelect/v1/index.tsx index d9452719e2..b36f5b43d8 100644 --- a/packages/ui-simple-select/src/SimpleSelect/v1/index.tsx +++ b/packages/ui-simple-select/src/SimpleSelect/v1/index.tsx @@ -39,8 +39,8 @@ import { withDeterministicId } from '@instructure/ui-react-utils' -import { Select } from '@instructure/ui-select/latest' -import type { SelectProps } from '@instructure/ui-select/latest' +import { Select } from '@instructure/ui-select/v11_6' +import type { SelectProps } from '@instructure/ui-select/v11_6' import { Option } from './Option' import type { diff --git a/packages/ui-simple-select/src/SimpleSelect/v1/props.ts b/packages/ui-simple-select/src/SimpleSelect/v1/props.ts index 63c8c5783d..3467557003 100644 --- a/packages/ui-simple-select/src/SimpleSelect/v1/props.ts +++ b/packages/ui-simple-select/src/SimpleSelect/v1/props.ts @@ -24,7 +24,7 @@ import { InputHTMLAttributes } from 'react' -import type { FormMessage } from '@instructure/ui-form-field' +import type { FormMessage } from '@instructure/ui-form-field/v11_6' import type { OtherHTMLAttributes, PickPropsWithExceptions @@ -34,7 +34,7 @@ import type { PositionConstraint, PositionMountNode } from '@instructure/ui-position' -import type { SelectOwnProps } from '@instructure/ui-select' +import type { SelectOwnProps } from '@instructure/ui-select/v11_6' import type { WithDeterministicIdProps } from '@instructure/ui-react-utils' import { Renderable } from '@instructure/shared-types' diff --git a/packages/ui-source-code-editor/src/SourceCodeEditor/v1/SearchPanel.tsx b/packages/ui-source-code-editor/src/SourceCodeEditor/v1/SearchPanel.tsx index bf6f5fbff1..4d69aaecb8 100644 --- a/packages/ui-source-code-editor/src/SourceCodeEditor/v1/SearchPanel.tsx +++ b/packages/ui-source-code-editor/src/SourceCodeEditor/v1/SearchPanel.tsx @@ -32,8 +32,8 @@ import { closeSearchPanel } from '@codemirror/search' import { EditorView } from '@codemirror/view' -import { TextInput } from '@instructure/ui-text-input' -import { IconButton } from '@instructure/ui-buttons' +import { TextInput } from '@instructure/ui-text-input/v11_6' +import { IconButton } from '@instructure/ui-buttons/v11_6' import { IconArrowOpenDownLine, IconArrowOpenUpLine, diff --git a/packages/ui-source-code-editor/src/SourceCodeEditor/v2/SearchPanel.tsx b/packages/ui-source-code-editor/src/SourceCodeEditor/v2/SearchPanel.tsx index 91c1908428..bb7599bcfe 100644 --- a/packages/ui-source-code-editor/src/SourceCodeEditor/v2/SearchPanel.tsx +++ b/packages/ui-source-code-editor/src/SourceCodeEditor/v2/SearchPanel.tsx @@ -32,7 +32,7 @@ import { closeSearchPanel } from '@codemirror/search' import { EditorView } from '@codemirror/view' -import { TextInput } from '@instructure/ui-text-input' +import { TextInput } from '@instructure/ui-text-input/latest' import { IconButton } from '@instructure/ui-buttons/latest' import { IconArrowOpenDownLine, diff --git a/packages/ui-tabs/src/Tabs/v1/Tab/props.ts b/packages/ui-tabs/src/Tabs/v1/Tab/props.ts index 0b8ef7c770..4a36510461 100644 --- a/packages/ui-tabs/src/Tabs/v1/Tab/props.ts +++ b/packages/ui-tabs/src/Tabs/v1/Tab/props.ts @@ -29,7 +29,7 @@ import type { TabsTabTheme } from '@instructure/shared-types' import type { WithStyleProps, ComponentStyle } from '@instructure/emotion' -import type { ViewOwnProps } from '@instructure/ui-view' +import type { ViewOwnProps } from '@instructure/ui-view/v11_6' type TabsTabOwnProps = { variant?: 'default' | 'secondary' diff --git a/packages/ui-tabs/src/Tabs/v1/props.ts b/packages/ui-tabs/src/Tabs/v1/props.ts index 17a25c0e82..ce2818a2db 100644 --- a/packages/ui-tabs/src/Tabs/v1/props.ts +++ b/packages/ui-tabs/src/Tabs/v1/props.ts @@ -29,7 +29,7 @@ import type { } from '@instructure/emotion' import type { OtherHTMLAttributes, TabsTheme } from '@instructure/shared-types' import type { TextDirectionContextConsumerProps } from '@instructure/ui-i18n' -import type { ViewOwnProps } from '@instructure/ui-view' +import type { ViewOwnProps } from '@instructure/ui-view/v11_6' type TabsOwnProps = { /** diff --git a/packages/ui-tabs/src/Tabs/v2/Tab/props.ts b/packages/ui-tabs/src/Tabs/v2/Tab/props.ts index 0b8ef7c770..3c62bbe592 100644 --- a/packages/ui-tabs/src/Tabs/v2/Tab/props.ts +++ b/packages/ui-tabs/src/Tabs/v2/Tab/props.ts @@ -29,7 +29,7 @@ import type { TabsTabTheme } from '@instructure/shared-types' import type { WithStyleProps, ComponentStyle } from '@instructure/emotion' -import type { ViewOwnProps } from '@instructure/ui-view' +import type { ViewOwnProps } from '@instructure/ui-view/latest' type TabsTabOwnProps = { variant?: 'default' | 'secondary' diff --git a/packages/ui-tabs/src/Tabs/v2/props.ts b/packages/ui-tabs/src/Tabs/v2/props.ts index 17a25c0e82..9c6a74b513 100644 --- a/packages/ui-tabs/src/Tabs/v2/props.ts +++ b/packages/ui-tabs/src/Tabs/v2/props.ts @@ -29,7 +29,7 @@ import type { } from '@instructure/emotion' import type { OtherHTMLAttributes, TabsTheme } from '@instructure/shared-types' import type { TextDirectionContextConsumerProps } from '@instructure/ui-i18n' -import type { ViewOwnProps } from '@instructure/ui-view' +import type { ViewOwnProps } from '@instructure/ui-view/latest' type TabsOwnProps = { /** diff --git a/packages/ui-tag/src/Tag/v1/props.ts b/packages/ui-tag/src/Tag/v1/props.ts index 9037fee729..0ee6b5adaf 100644 --- a/packages/ui-tag/src/Tag/v1/props.ts +++ b/packages/ui-tag/src/Tag/v1/props.ts @@ -23,7 +23,7 @@ */ import React from 'react' -import type { ViewProps } from '@instructure/ui-view' +import type { ViewProps } from '@instructure/ui-view/v11_6' import type { Spacing, WithStyleProps, diff --git a/packages/ui-tag/src/Tag/v2/props.ts b/packages/ui-tag/src/Tag/v2/props.ts index 9037fee729..efb45d8f31 100644 --- a/packages/ui-tag/src/Tag/v2/props.ts +++ b/packages/ui-tag/src/Tag/v2/props.ts @@ -23,7 +23,7 @@ */ import React from 'react' -import type { ViewProps } from '@instructure/ui-view' +import type { ViewProps } from '@instructure/ui-view/latest' import type { Spacing, WithStyleProps, diff --git a/packages/ui-text-area/src/TextArea/v1/props.ts b/packages/ui-text-area/src/TextArea/v1/props.ts index a94ead31a6..703c734567 100644 --- a/packages/ui-text-area/src/TextArea/v1/props.ts +++ b/packages/ui-text-area/src/TextArea/v1/props.ts @@ -29,7 +29,7 @@ import type { TextAreaTheme, PickPropsWithExceptions } from '@instructure/shared-types' -import type { FormMessage, FormFieldOwnProps } from '@instructure/ui-form-field' +import type { FormMessage, FormFieldOwnProps } from '@instructure/ui-form-field/v11_6' import type { WithStyleProps, ComponentStyle, diff --git a/packages/ui-text-area/src/TextArea/v2/props.ts b/packages/ui-text-area/src/TextArea/v2/props.ts index c3729acdd4..227b697f98 100644 --- a/packages/ui-text-area/src/TextArea/v2/props.ts +++ b/packages/ui-text-area/src/TextArea/v2/props.ts @@ -28,7 +28,7 @@ import type { OtherHTMLAttributes, PickPropsWithExceptions } from '@instructure/shared-types' -import type { FormMessage, FormFieldOwnProps } from '@instructure/ui-form-field' +import type { FormMessage, FormFieldOwnProps } from '@instructure/ui-form-field/latest' import type { ComponentStyle, Spacing, diff --git a/packages/ui-text-input/src/TextInput/v1/props.ts b/packages/ui-text-input/src/TextInput/v1/props.ts index 429d01a2b1..7f34c0ae27 100644 --- a/packages/ui-text-input/src/TextInput/v1/props.ts +++ b/packages/ui-text-input/src/TextInput/v1/props.ts @@ -24,7 +24,7 @@ import { InputHTMLAttributes } from 'react' -import type { FormFieldProps, FormMessage } from '@instructure/ui-form-field' +import type { FormFieldProps, FormMessage } from '@instructure/ui-form-field/v11_6' import type { OtherHTMLAttributes, TextInputTheme diff --git a/packages/ui-text-input/src/TextInput/v2/props.ts b/packages/ui-text-input/src/TextInput/v2/props.ts index 20942902e2..829cd29464 100644 --- a/packages/ui-text-input/src/TextInput/v2/props.ts +++ b/packages/ui-text-input/src/TextInput/v2/props.ts @@ -24,7 +24,7 @@ import { InputHTMLAttributes } from 'react' -import type { FormFieldProps, FormMessage } from '@instructure/ui-form-field' +import type { FormFieldProps, FormMessage } from '@instructure/ui-form-field/latest' import type { OtherHTMLAttributes, TextInputTheme diff --git a/packages/ui-time-select/src/TimeSelect/v1/index.tsx b/packages/ui-time-select/src/TimeSelect/v1/index.tsx index 9fa0987932..f41117a00a 100644 --- a/packages/ui-time-select/src/TimeSelect/v1/index.tsx +++ b/packages/ui-time-select/src/TimeSelect/v1/index.tsx @@ -31,10 +31,10 @@ import { callRenderProp, withDeterministicId } from '@instructure/ui-react-utils' -import { Select } from '@instructure/ui-select/latest' +import { Select } from '@instructure/ui-select/v11_6' import * as utils from '@instructure/ui-utils' -import type { SelectProps } from '@instructure/ui-select/latest' +import type { SelectProps } from '@instructure/ui-select/v11_6' import type { TimeSelectProps, TimeSelectState, diff --git a/packages/ui-time-select/src/TimeSelect/v1/props.ts b/packages/ui-time-select/src/TimeSelect/v1/props.ts index 6bf29d0f4a..00c7380a28 100644 --- a/packages/ui-time-select/src/TimeSelect/v1/props.ts +++ b/packages/ui-time-select/src/TimeSelect/v1/props.ts @@ -24,7 +24,7 @@ import { InputHTMLAttributes } from 'react' -import type { FormMessage } from '@instructure/ui-form-field' +import type { FormMessage } from '@instructure/ui-form-field/v11_6' import type { OtherHTMLAttributes } from '@instructure/shared-types' import type { PlacementPropValues, diff --git a/packages/ui-toggle-details/package.json b/packages/ui-toggle-details/package.json index ccc3656b84..b8df111ca5 100644 --- a/packages/ui-toggle-details/package.json +++ b/packages/ui-toggle-details/package.json @@ -74,18 +74,18 @@ "default": "./es/exports/a.js" }, "./v11_7": { - "src": "./src/exports/a.ts", - "types": "./types/exports/a.d.ts", - "import": "./es/exports/a.js", - "require": "./lib/exports/a.js", - "default": "./es/exports/a.js" + "src": "./src/exports/b.ts", + "types": "./types/exports/b.d.ts", + "import": "./es/exports/b.js", + "require": "./lib/exports/b.js", + "default": "./es/exports/b.js" }, "./latest": { - "src": "./src/exports/a.ts", - "types": "./types/exports/a.d.ts", - "import": "./es/exports/a.js", - "require": "./lib/exports/a.js", - "default": "./es/exports/a.js" + "src": "./src/exports/b.ts", + "types": "./types/exports/b.d.ts", + "import": "./es/exports/b.js", + "require": "./lib/exports/b.js", + "default": "./es/exports/b.js" } } } diff --git a/packages/ui-toggle-details/src/ToggleDetails/v1/props.ts b/packages/ui-toggle-details/src/ToggleDetails/v1/props.ts index a082256d5b..9efd35f0fa 100644 --- a/packages/ui-toggle-details/src/ToggleDetails/v1/props.ts +++ b/packages/ui-toggle-details/src/ToggleDetails/v1/props.ts @@ -29,7 +29,7 @@ import type { ToggleDetailsTheme } from '@instructure/shared-types' import type { WithStyleProps, ComponentStyle } from '@instructure/emotion' -import type { ViewProps } from '@instructure/ui-view' +import type { ViewProps } from '@instructure/ui-view/v11_6' type ToggleDetailsOwnProps = { variant?: 'default' | 'filled' diff --git a/packages/ui-toggle-details/src/ToggleDetails/v2/index.tsx b/packages/ui-toggle-details/src/ToggleDetails/v2/index.tsx index e28c7e55bb..7dec3d88f3 100644 --- a/packages/ui-toggle-details/src/ToggleDetails/v2/index.tsx +++ b/packages/ui-toggle-details/src/ToggleDetails/v2/index.tsx @@ -37,7 +37,7 @@ import generateStyle from './styles' import type { ToggleDetailsProps } from './props' import { allowedProps } from './props' import type { ExpandableToggleProps } from '@instructure/ui-expandable' -import type { ViewProps } from '@instructure/ui-view/v11_6' +import type { ViewProps } from '@instructure/ui-view/latest' /** --- diff --git a/packages/ui-toggle-details/src/ToggleDetails/v2/props.ts b/packages/ui-toggle-details/src/ToggleDetails/v2/props.ts index a082256d5b..e34bb100d5 100644 --- a/packages/ui-toggle-details/src/ToggleDetails/v2/props.ts +++ b/packages/ui-toggle-details/src/ToggleDetails/v2/props.ts @@ -29,7 +29,7 @@ import type { ToggleDetailsTheme } from '@instructure/shared-types' import type { WithStyleProps, ComponentStyle } from '@instructure/emotion' -import type { ViewProps } from '@instructure/ui-view' +import type { ViewProps } from '@instructure/ui-view/latest' type ToggleDetailsOwnProps = { variant?: 'default' | 'filled' diff --git a/packages/ui-toggle-details/src/ToggleGroup/v1/index.tsx b/packages/ui-toggle-details/src/ToggleGroup/v1/index.tsx index 4eb239017e..b2c8f89c9a 100644 --- a/packages/ui-toggle-details/src/ToggleGroup/v1/index.tsx +++ b/packages/ui-toggle-details/src/ToggleGroup/v1/index.tsx @@ -30,13 +30,13 @@ import { getElementType, callRenderProp } from '@instructure/ui-react-utils' -import { IconButton } from '@instructure/ui-buttons/latest' +import { IconButton } from '@instructure/ui-buttons/v11_6' import { Transition } from '@instructure/ui-motion' import { Expandable } from '@instructure/ui-expandable' import type { ExpandableToggleProps } from '@instructure/ui-expandable' import { isActiveElement } from '@instructure/ui-dom-utils' -import { Flex } from '@instructure/ui-flex/latest' -import { View } from '@instructure/ui-view/latest' +import { Flex } from '@instructure/ui-flex/v11_6' +import { View } from '@instructure/ui-view/v11_6' import { IconArrowOpenEndSolid, IconArrowOpenDownSolid diff --git a/packages/ui-tooltip/src/Tooltip/v1/props.ts b/packages/ui-tooltip/src/Tooltip/v1/props.ts index 87e221005b..07d9aaabb1 100644 --- a/packages/ui-tooltip/src/Tooltip/v1/props.ts +++ b/packages/ui-tooltip/src/Tooltip/v1/props.ts @@ -35,7 +35,7 @@ import type { PositionMountNode } from '@instructure/ui-position' import type { WithStyleProps, ComponentStyle } from '@instructure/emotion' -import type { PopoverOwnProps } from '@instructure/ui-popover' +import type { PopoverOwnProps } from '@instructure/ui-popover/v11_6' import type { WithDeterministicIdProps } from '@instructure/ui-react-utils' import { Renderable } from '@instructure/shared-types' diff --git a/packages/ui-tooltip/src/Tooltip/v2/props.ts b/packages/ui-tooltip/src/Tooltip/v2/props.ts index 87e221005b..86de063066 100644 --- a/packages/ui-tooltip/src/Tooltip/v2/props.ts +++ b/packages/ui-tooltip/src/Tooltip/v2/props.ts @@ -35,7 +35,7 @@ import type { PositionMountNode } from '@instructure/ui-position' import type { WithStyleProps, ComponentStyle } from '@instructure/emotion' -import type { PopoverOwnProps } from '@instructure/ui-popover' +import type { PopoverOwnProps } from '@instructure/ui-popover/latest' import type { WithDeterministicIdProps } from '@instructure/ui-react-utils' import { Renderable } from '@instructure/shared-types' diff --git a/packages/ui-top-nav-bar/src/TopNavBar/v1/TopNavBarBrand/props.ts b/packages/ui-top-nav-bar/src/TopNavBar/v1/TopNavBarBrand/props.ts index 7198c570f1..db3f2641df 100644 --- a/packages/ui-top-nav-bar/src/TopNavBar/v1/TopNavBarBrand/props.ts +++ b/packages/ui-top-nav-bar/src/TopNavBar/v1/TopNavBarBrand/props.ts @@ -29,7 +29,7 @@ import type { OtherHTMLAttributes, AsElementType } from '@instructure/shared-types' -import type { ViewOwnProps } from '@instructure/ui-view' +import type { ViewOwnProps } from '@instructure/ui-view/v11_6' import type { TopNavBarContextType } from '../TopNavBarContext' import { TopNavBarBrand } from './index' diff --git a/packages/ui-top-nav-bar/src/TopNavBar/v1/TopNavBarBreadcrumb/props.ts b/packages/ui-top-nav-bar/src/TopNavBar/v1/TopNavBarBreadcrumb/props.ts index b05cf9e367..fa612e6e57 100644 --- a/packages/ui-top-nav-bar/src/TopNavBar/v1/TopNavBarBreadcrumb/props.ts +++ b/packages/ui-top-nav-bar/src/TopNavBar/v1/TopNavBarBreadcrumb/props.ts @@ -23,14 +23,14 @@ */ import { ComponentElement } from 'react' -import type { ViewOwnProps } from '@instructure/ui-view' +import type { ViewOwnProps } from '@instructure/ui-view/v11_6' import type { ComponentStyle, WithStyleProps } from '@instructure/emotion' import { TopNavBarContextType } from '../TopNavBarContext' import { ChildrenOfType, OtherHTMLAttributes } from '@instructure/shared-types' import TopNavBarBreadcrumb from './index' -import { Breadcrumb } from '@instructure/ui-breadcrumb' -import type { BreadcrumbProps } from '@instructure/ui-breadcrumb' +import { Breadcrumb } from '@instructure/ui-breadcrumb/v11_6' +import type { BreadcrumbProps } from '@instructure/ui-breadcrumb/v11_6' type TopNavBarBreadcrumbProps = TopNavBarBreadcrumbOwnProps & WithStyleProps & diff --git a/packages/ui-top-nav-bar/src/TopNavBar/v1/TopNavBarItem/props.ts b/packages/ui-top-nav-bar/src/TopNavBar/v1/TopNavBarItem/props.ts index 94d10a57b4..fd46d868c3 100644 --- a/packages/ui-top-nav-bar/src/TopNavBar/v1/TopNavBarItem/props.ts +++ b/packages/ui-top-nav-bar/src/TopNavBar/v1/TopNavBarItem/props.ts @@ -33,12 +33,12 @@ import type { AsElementType } from '@instructure/shared-types' -import { Drilldown } from '@instructure/ui-drilldown' -import type { DrilldownProps } from '@instructure/ui-drilldown' -import type { PopoverProps } from '@instructure/ui-popover' -import type { TooltipProps } from '@instructure/ui-tooltip' -import type { BaseButtonOwnProps } from '@instructure/ui-buttons' -import type { ViewOwnProps, ViewProps } from '@instructure/ui-view' +import { Drilldown } from '@instructure/ui-drilldown/v11_6' +import type { DrilldownProps } from '@instructure/ui-drilldown/v11_6' +import type { PopoverProps } from '@instructure/ui-popover/v11_6' +import type { TooltipProps } from '@instructure/ui-tooltip/v11_6' +import type { BaseButtonOwnProps } from '@instructure/ui-buttons/v11_6' +import type { ViewOwnProps, ViewProps } from '@instructure/ui-view/v11_6' import { TopNavBarContextType } from '../TopNavBarContext' import { TopNavBarItem } from './index' diff --git a/packages/ui-top-nav-bar/src/TopNavBar/v1/TopNavBarLayout/SmallViewportLayout/index.tsx b/packages/ui-top-nav-bar/src/TopNavBar/v1/TopNavBarLayout/SmallViewportLayout/index.tsx index 88a70240c2..64afdc2d14 100644 --- a/packages/ui-top-nav-bar/src/TopNavBar/v1/TopNavBarLayout/SmallViewportLayout/index.tsx +++ b/packages/ui-top-nav-bar/src/TopNavBar/v1/TopNavBarLayout/SmallViewportLayout/index.tsx @@ -46,10 +46,10 @@ import { IconArrowOpenDownSolid, IconArrowOpenUpSolid } from '@instructure/ui-icons' -import { Avatar } from '@instructure/ui-avatar' +import { Avatar } from '@instructure/ui-avatar/v11_6' import { Dialog } from '@instructure/ui-dialog' -import { Drilldown } from '@instructure/ui-drilldown' -import type { DrilldownPageChildren } from '@instructure/ui-drilldown' +import { Drilldown } from '@instructure/ui-drilldown/v11_6' +import type { DrilldownPageChildren } from '@instructure/ui-drilldown/v11_6' import { TopNavBarItem } from '../../TopNavBarItem' import type { ItemChild, TopNavBarItemProps } from '../../TopNavBarItem/props' diff --git a/packages/ui-top-nav-bar/src/TopNavBar/v1/TopNavBarLayout/SmallViewportLayout/props.ts b/packages/ui-top-nav-bar/src/TopNavBar/v1/TopNavBarLayout/SmallViewportLayout/props.ts index 1205fbb591..52c41506c0 100644 --- a/packages/ui-top-nav-bar/src/TopNavBar/v1/TopNavBarLayout/SmallViewportLayout/props.ts +++ b/packages/ui-top-nav-bar/src/TopNavBar/v1/TopNavBarLayout/SmallViewportLayout/props.ts @@ -30,7 +30,7 @@ import type { OtherHTMLAttributes } from '@instructure/shared-types' -import type { DrilldownProps } from '@instructure/ui-drilldown' +import type { DrilldownProps } from '@instructure/ui-drilldown/v11_6' import type { TopNavBarItemTooltipType } from '../../TopNavBarItem/props' import type { TopNavBarContextType } from '../../TopNavBarContext' diff --git a/packages/ui-top-nav-bar/src/TopNavBar/v1/index.tsx b/packages/ui-top-nav-bar/src/TopNavBar/v1/index.tsx index 266aeb61a8..9d078e36a2 100644 --- a/packages/ui-top-nav-bar/src/TopNavBar/v1/index.tsx +++ b/packages/ui-top-nav-bar/src/TopNavBar/v1/index.tsx @@ -28,7 +28,7 @@ import { error } from '@instructure/console' import { px } from '@instructure/ui-utils' import { matchComponentTypes } from '@instructure/ui-react-utils' -import { Responsive } from '@instructure/ui-responsive' +import { Responsive } from '@instructure/ui-responsive/v11_6' import { TopNavBarActionItems } from './TopNavBarActionItems' import { TopNavBarBrand } from './TopNavBarBrand' diff --git a/packages/ui-top-nav-bar/src/TopNavBar/v1/utils/exampleHelpers.tsx b/packages/ui-top-nav-bar/src/TopNavBar/v1/utils/exampleHelpers.tsx index 574c48abe8..1810578a69 100644 --- a/packages/ui-top-nav-bar/src/TopNavBar/v1/utils/exampleHelpers.tsx +++ b/packages/ui-top-nav-bar/src/TopNavBar/v1/utils/exampleHelpers.tsx @@ -22,7 +22,7 @@ * SOFTWARE. */ -import { Drilldown } from '@instructure/ui-drilldown' +import { Drilldown } from '@instructure/ui-drilldown/v11_6' import { IconQuestionLine, IconAlertsLine, @@ -44,7 +44,7 @@ import type { TopNavBarContextType } from '../TopNavBarContext' import { TopNavBar } from '../index' import { elevateIcon } from './exampleSvgFiles' -import { Breadcrumb } from '@instructure/ui-breadcrumb' +import { Breadcrumb } from '@instructure/ui-breadcrumb/v11_6' type ChildrenFuncProps = { currentLayout: TopNavBarContextType['layout'] diff --git a/packages/ui-top-nav-bar/src/TopNavBar/v1/utils/mapItemsForDrilldown.tsx b/packages/ui-top-nav-bar/src/TopNavBar/v1/utils/mapItemsForDrilldown.tsx index f89e94f167..6bf4182621 100644 --- a/packages/ui-top-nav-bar/src/TopNavBar/v1/utils/mapItemsForDrilldown.tsx +++ b/packages/ui-top-nav-bar/src/TopNavBar/v1/utils/mapItemsForDrilldown.tsx @@ -28,12 +28,12 @@ import { warn } from '@instructure/console' import { generateId } from '@instructure/ui-utils' import { matchComponentTypes } from '@instructure/ui-react-utils' -import { Drilldown } from '@instructure/ui-drilldown' +import { Drilldown } from '@instructure/ui-drilldown/v11_6' import type { DrilldownPageChild, DrilldownOptionChild, DrilldownOptionProps -} from '@instructure/ui-drilldown' +} from '@instructure/ui-drilldown/v11_6' import { TopNavBarItem } from '../TopNavBarItem' import type { ItemChild, TopNavBarItemProps } from '../TopNavBarItem/props'