-
Notifications
You must be signed in to change notification settings - Fork 110
fix(ui-many): fix imports of the multiversion support #2444
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -25,7 +25,7 @@ | |
| import { Component } from 'react' | ||
|
|
||
| import { omitProps } from '@instructure/ui-react-utils' | ||
| import { View } from '@instructure/ui-view/latest' | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 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' | ||
|
|
||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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' | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think this needs to be |
||
|
|
||
| import ColorIndicator from '../../ColorIndicator/v1' | ||
|
|
||
|
|
@@ -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
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 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> | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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' | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think this needs to be |
||
| import { px } from '@instructure/ui-utils' | ||
| import { withDeterministicId } from '@instructure/ui-react-utils' | ||
|
|
||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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' | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think this needs to be |
||
|
|
||
| import { allowedProps } from './props' | ||
| import type { RGBAInputProps, RGBAInputState } from './props' | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think this needs to be |
||
|
|
||
| import { allowedProps } from './props' | ||
| import type { SliderProps, SliderStyleProps } from './props' | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think this needs to be |
||
|
|
||
| import ColorIndicator from '../../ColorIndicator/v1' | ||
| import ColorMixer from '../../ColorMixer/v1' | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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' | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think this needs to be |
||
| import type { | ||
| WithStyleProps, | ||
| ComponentStyle, | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think this needs to be |
||
| import { IconAddLine, IconCheckDarkSolid } from '@instructure/ui-icons' | ||
|
|
||
| import { ColorIndicator } from '../../ColorIndicator/v1' | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since Byline has just this version, we should use the
/latest?