Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/ui-billboard/src/Billboard/v1/props.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion packages/ui-billboard/src/Billboard/v2/props.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
4 changes: 2 additions & 2 deletions packages/ui-buttons/src/BaseButton/v1/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/ui-buttons/src/BaseButton/v1/props.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
2 changes: 1 addition & 1 deletion packages/ui-buttons/src/Button/v1/props.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
/**
Expand Down
2 changes: 1 addition & 1 deletion packages/ui-buttons/src/CloseButton/v1/props.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
/**
Expand Down
2 changes: 1 addition & 1 deletion packages/ui-buttons/src/CondensedButton/v1/props.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
/**
Expand Down
2 changes: 1 addition & 1 deletion packages/ui-buttons/src/IconButton/v1/props.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
/**
Expand Down
2 changes: 1 addition & 1 deletion packages/ui-buttons/src/ToggleButton/v1/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion packages/ui-buttons/src/ToggleButton/v1/props.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
2 changes: 1 addition & 1 deletion packages/ui-byline/src/Byline/v1/__tests__/Byline.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since Byline has just this version, we should use the /latest?

import { View } from '@instructure/ui-view/v11_6'

const TEST_TITLE = 'Test-title'
const TEST_DESCRIPTION = 'Test-description'
Expand Down
2 changes: 1 addition & 1 deletion packages/ui-byline/src/Byline/v1/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import { Component } from 'react'

import { omitProps } from '@instructure/ui-react-utils'
import { View } from '@instructure/ui-view/latest'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since Byline has just this version, we should use the /latest?

import { View } from '@instructure/ui-view/v11_6'

import { withStyleLegacy as withStyle } from '@instructure/emotion'

Expand Down
2 changes: 1 addition & 1 deletion packages/ui-calendar/src/Calendar/v1/Day/props.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
6 changes: 3 additions & 3 deletions packages/ui-calendar/src/Calendar/v1/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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'

/**
---
Expand Down
2 changes: 1 addition & 1 deletion packages/ui-calendar/src/Calendar/v2/Day/props.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
4 changes: 2 additions & 2 deletions packages/ui-calendar/src/Calendar/v2/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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'

/**
---
Expand Down
2 changes: 1 addition & 1 deletion packages/ui-checkbox/src/Checkbox/v1/props.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion packages/ui-checkbox/src/Checkbox/v2/props.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion packages/ui-checkbox/src/CheckboxGroup/v1/props.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
6 changes: 3 additions & 3 deletions packages/ui-checkbox/src/CheckboxGroup/v2/props.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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<CheckboxProps, Checkbox>

Expand Down
8 changes: 4 additions & 4 deletions packages/ui-color-picker/src/ColorContrast/v1/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this needs to be /latest because this has just one version


import ColorIndicator from '../../ColorIndicator/v1'

Expand Down Expand Up @@ -117,7 +117,7 @@ class ColorContrast extends Component<ColorContrastProps, ColorContrastState> {
{description}
</div>
<div css={styles?.statusIndicatorWrapper}>
<Pill color={pass ? 'success' : 'error'}>
<Pill color={pass ? 'success' : 'danger'}>
{pass ? successLabel : failureLabel}
Comment on lines 119 to 121
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It threw some error so I fixed this. It is 'danger' on master https://github.com/instructure/instructure-ui/blob/master/packages/ui-color-picker/src/ColorContrast/index.tsx so this must have been an older version of the index file? This also in my ColorPicker rework. #2439

</Pill>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this needs to be /latest because this has just one version

import { px } from '@instructure/ui-utils'
import { withDeterministicId } from '@instructure/ui-react-utils'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this needs to be /latest because this has just one version


import { allowedProps } from './props'
import type { RGBAInputProps, RGBAInputState } from './props'
Expand Down
4 changes: 2 additions & 2 deletions packages/ui-color-picker/src/ColorMixer/v1/Slider/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Comment on lines +30 to +31
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this needs to be /latest because this has just one version


import { allowedProps } from './props'
import type { SliderProps, SliderStyleProps } from './props'
Expand Down
10 changes: 5 additions & 5 deletions packages/ui-color-picker/src/ColorPicker/v1/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Comment on lines +35 to +45
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this needs to be /latest because this has just one version


import ColorIndicator from '../../ColorIndicator/v1'
import ColorMixer from '../../ColorMixer/v1'
Expand Down
2 changes: 1 addition & 1 deletion packages/ui-color-picker/src/ColorPicker/v1/props.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this needs to be /latest because this has just one version

import type {
WithStyleProps,
ComponentStyle,
Expand Down
14 changes: 7 additions & 7 deletions packages/ui-color-picker/src/ColorPreset/v1/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Comment on lines +31 to +37
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this needs to be /latest because this has just one version

import { IconAddLine, IconCheckDarkSolid } from '@instructure/ui-icons'

import { ColorIndicator } from '../../ColorIndicator/v1'
Expand Down
4 changes: 2 additions & 2 deletions packages/ui-date-input/src/DateInput/v1/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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'

/**
---
Expand Down
4 changes: 2 additions & 2 deletions packages/ui-date-input/src/DateInput/v1/props.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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('<DateInput />', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/ui-date-input/src/DateInput/v2/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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'

/**
---
Expand Down
4 changes: 2 additions & 2 deletions packages/ui-date-input/src/DateInput/v2/props.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Loading
Loading