Skip to content

Commit 073be7b

Browse files
committed
feat(many): add new package (instructure) and three new components: AiInformation, NutritionFacts and DataPermissionLevels
INSTUI-4605
1 parent b6c7e0b commit 073be7b

38 files changed

+2289
-87
lines changed

package-lock.json

Lines changed: 36 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/__docs__/components.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,11 @@ export { Editable, InPlaceEdit } from '@instructure/ui-editable'
5454
export { Expandable } from '@instructure/ui-expandable'
5555
export { Focusable } from '@instructure/ui-focusable'
5656
export { Img } from '@instructure/ui-img'
57+
export {
58+
NutritionFacts,
59+
DataPermissionLevels,
60+
AiInformation
61+
} from '@instructure/ui-instructure'
5762
export { NumberInput } from '@instructure/ui-number-input'
5863
export { DateInput, DateInput2 } from '@instructure/ui-date-input'
5964
export { DateTimeInput } from '@instructure/ui-date-time-input'

packages/__docs__/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
"@instructure/ui-i18n": "10.21.0",
6666
"@instructure/ui-icons": "10.21.0",
6767
"@instructure/ui-img": "10.21.0",
68+
"@instructure/ui-instructure": "10.21.0",
6869
"@instructure/ui-link": "10.21.0",
6970
"@instructure/ui-list": "10.21.0",
7071
"@instructure/ui-menu": "10.21.0",

packages/__docs__/resolve.mjs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ const alias = {
9696
'@instructure/ui-grid$': path.resolve(import.meta.dirname, '../ui-grid/src/'),
9797
'@instructure/ui-i18n$': path.resolve(import.meta.dirname, '../ui-i18n/src/'),
9898
'@instructure/ui-img$': path.resolve(import.meta.dirname, '../ui-img/src/'),
99+
'@instructure/ui-instructure$': path.resolve(import.meta.dirname, '../ui-instructure/src/'),
99100
'@instructure/ui-link$': path.resolve(import.meta.dirname, '../ui-link/src/'),
100101
'@instructure/ui-list$': path.resolve(import.meta.dirname, '../ui-list/src/'),
101102
'@instructure/ui-menu$': path.resolve(import.meta.dirname, '../ui-menu/src/'),

packages/__docs__/src/Properties/styles.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ const generateStyle = (): PropertiesStyle => {
3939
properties: {
4040
label: 'properties',
4141
marginTop: '2rem',
42-
code: { background: 'transparent', border: 'none' }
42+
code: { background: 'transparent', border: 'none' },
43+
overflow: 'auto'
4344
},
4445

4546
list: {

packages/__docs__/tsconfig.build.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,9 @@
127127
{
128128
"path": "../ui-img/tsconfig.build.json"
129129
},
130+
{
131+
"path": "../ui-instructure/tsconfig.build.json"
132+
},
130133
{
131134
"path": "../ui-link/tsconfig.build.json"
132135
},

packages/emotion/src/getComponentThemeOverride.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ const getComponentThemeOverride = (
5656
const name = displayName as ComponentName
5757
const id = componentId as ComponentName
5858

59-
const { themeOverride } = props as WithStyleProps
59+
const themeOverride = props ? props.themeOverride : undefined
60+
6061
const { componentOverrides } = theme as Overrides
6162

6263
let overridesFromTheme: Partial<ComponentTheme> = {}

packages/shared-types/src/ComponentThemeVariables.ts

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -682,6 +682,52 @@ export type ImgTheme = {
682682
imageBlurAmount: string | 0
683683
}
684684

685+
export type NutritionFactsTheme = {
686+
cardBorderRadius: Border['radiusMedium']
687+
cardBorderColor: string
688+
cardBorderWidth: Border['widthSmall']
689+
cardPadding: Spacing['space12']
690+
cardExplainerContainerBottomMargin: Spacing['space8']
691+
cardGap: Spacing['modalElements']
692+
bodyPadding: Spacing['paddingCardLarge']
693+
blockGap: Spacing['sectionElements']
694+
}
695+
696+
export type DataPermissionLevelsTheme = {
697+
cardBorderRadius: Border['radiusMedium']
698+
cardBorderColor: string
699+
cardBorderWidth: Border['widthMedium']
700+
cardPadding: Spacing['space12']
701+
cardExplainerContainerBottomMargin: Spacing['space8']
702+
cardGap: Spacing['modalElements']
703+
currentFeaturePaddingSides: Spacing['space12']
704+
currentFeaturePaddingTopBottom: Spacing['space8']
705+
permissionTitleBottomMargin: Spacing['space8']
706+
levelColor: string
707+
708+
bodyPadding: Spacing['paddingCardLarge']
709+
710+
aiTextLeftGradientColor: string
711+
aiTextRightGradientColor: string
712+
}
713+
714+
export type AiInformationTheme = {
715+
bodyPadding: Spacing['paddingCardLarge']
716+
headingBottomMargin: Spacing['sectionElements']
717+
featureNameBottomMargin: Spacing['moduleElements']
718+
permissionLevelTextBottomMargin: Spacing['space8']
719+
permissionLevelBottomMargin: Spacing['space8']
720+
descriptionBottomMargin: Spacing['space8']
721+
permissionLevelsModalTriggerBottomMargin: Spacing['moduleElements']
722+
modelNameTextBottomMargin: Spacing['space4']
723+
modelNameBottomMargin: Spacing['space4']
724+
725+
dividerMargin: Spacing['moduleElements']
726+
dividerColor: string
727+
728+
levelColor: string
729+
}
730+
685731
export type LinkTheme = {
686732
fontFamily: Typography['fontFamily']
687733
fontWeight: Typography['fontWeightNormal']

packages/ui-heading/src/Heading/styles.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ const generateStyle = (
3939
componentTheme: HeadingTheme,
4040
props: HeadingProps
4141
): HeadingStyle => {
42-
const { level, color, border, variant, renderIcon, aiVariant } = props
42+
const { level, color, border, variant, aiVariant } = props
4343

4444
const variants: Record<NonNullable<HeadingProps['variant']>, object> = {
4545
titlePageDesktop: {
@@ -223,10 +223,10 @@ const generateStyle = (
223223
alignItems: 'center',
224224
...(aiVariant === 'stacked'
225225
? {
226-
display: 'flex',
227-
flexDirection: 'column',
228-
alignItems: 'flex-start'
229-
}
226+
display: 'flex',
227+
flexDirection: 'column',
228+
alignItems: 'flex-start'
229+
}
230230
: {})
231231
}
232232
}

packages/ui-heading/tsconfig.build.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
"composite": true,
66
"rootDir": "./src"
77
},
8-
"include": [
9-
"src"
10-
],
8+
"include": ["src"],
119
"references": [
1210
{
1311
"path": "../console/tsconfig.build.json"
@@ -39,9 +37,6 @@
3937
{
4038
"path": "../ui-babel-preset/tsconfig.build.json"
4139
},
42-
{
43-
"path": "../ui-test-utils/tsconfig.build.json"
44-
},
4540
{
4641
"path": "../ui-themes/tsconfig.build.json"
4742
}

0 commit comments

Comments
 (0)