@telus-uds/theme-allium 0.0.2-prerelease.1 → 0.0.2-prerelease.5

package/src/components/Typography.js

@@ -1,10 +1,8 @@
 import palette from '@telus-uds/palette-allium'
-import { getTypographySchema, validateComponentTheme } from '@telus-uds/tools-theme'
-import { appearances } from '@telus-uds/system-constants'
+import system from '@telus-uds/system-themes/src/tokens/rn'
+import { appearances } from '@telus-uds/system-themes/schema'
 
-const { color, fontSize, lineHeight, letterSpacing, font } = palette
-
-const Typography = {
+export default {
   appearances: {
     size: {
       description: `Styles text as body or heading text with a given size. Smaller numbers indicate larger sizes,
@@ -14,6 +12,7 @@ accessibility or SEO-related properties; use the heading prop if text should be
         'micro',
         'small',
         'large',
+        'eyebrow',
         'h1',
         'h2',
         'h3',
@@ -48,16 +47,20 @@ accessibility or SEO-related properties; use the heading prop if text should be
       values: [true],
       type: 'variant'
     },
-    viewport: appearances.viewport
+    viewport: appearances.system.viewport
   },
   tokens: {
+    // TODO: replace with font token
+    fontName: Object.keys(palette.font)[0],
     fontWeight: '400',
-    fontSize: fontSize.size16,
-    color: color.greyThunder,
-    lineHeight: lineHeight.ratio3to2,
-    textTransform: 'none',
-    fontName: Object.keys(font)[0],
-    fontScaleCap: fontSize.size64
+    // font: palette.font.HelveticaNow[400]
+
+    fontSize: palette.fontSize.size16,
+    color: palette.color.greyThunder,
+    lineHeight: palette.lineHeight.ratio3to2,
+    letterSpacing: system.letterSpacing.none,
+    textTransform: system.textTransform.none,
+    fontScaleCap: palette.fontSize.size64
   },
   rules: [
     /**
@@ -66,44 +69,44 @@ accessibility or SEO-related properties; use the heading prop if text should be
     {
       if: { colour: 'secondary' },
       tokens: {
-        color: color.greyCharcoal
+        color: palette.color.greyCharcoal
       }
     },
 
     {
       if: { size: ['display1', 'display2', 'h1', 'h2', 'h3'] },
       tokens: {
-        color: color.purpleTelus
+        color: palette.color.purpleTelus
       }
     },
     {
       if: { size: ['display1', 'display2', 'h1', 'h2', 'h3'], colour: 'secondary' },
       tokens: {
-        color: color.greyThunder
+        color: palette.color.greyThunder
       }
     },
     {
       if: { size: 'h6', colour: 'tertiary' }, // TODO pending confirmation that this is necessary
       tokens: {
-        color: color.greyShuttle
+        color: palette.color.greyShuttle
       }
     },
     {
       if: { size: 'eyebrow' },
       tokens: {
-        color: color.greyCharcoal
+        color: palette.color.greyCharcoal
       }
     },
     {
       if: { size: 'eyebrow', colour: 'secondary' },
       tokens: {
-        color: color.purpleTelus
+        color: palette.color.purpleTelus
       }
     },
     {
       if: { inverse: true },
       tokens: {
-        color: color.white
+        color: palette.color.white
       }
     },
 
@@ -114,17 +117,21 @@ accessibility or SEO-related properties; use the heading prop if text should be
     {
       if: { size: 'display1' },
       tokens: {
-        fontSize: fontSize.size40,
+        fontSize: palette.fontSize.size40,
+
+        // TODO: replace with font token
         fontWeight: '300',
-        lineHeight: lineHeight.ratio6to5,
-        letterSpacing: letterSpacing.medium
+        // font: palette.font.HelveticaNow[300]
+
+        lineHeight: palette.lineHeight.ratio6to5,
+        letterSpacing: palette.letterSpacing.medium
       }
     },
     {
       if: { size: 'display1', viewport: ['lg', 'xl'] },
       tokens: {
-        fontSize: fontSize.size64,
-        lineHeight: lineHeight.ratio9to8
+        fontSize: palette.fontSize.size64,
+        lineHeight: palette.lineHeight.ratio9to8
       }
     },
 
@@ -132,19 +139,27 @@ accessibility or SEO-related properties; use the heading prop if text should be
     {
       if: { size: 'display2' },
       tokens: {
-        fontSize: fontSize.size36,
+        fontSize: palette.fontSize.size36,
+
+        // TODO: replace with font token
         fontWeight: '400',
-        letterSpacing: letterSpacing.medium,
-        lineHeight: lineHeight.ratio11to9
+        // font: palette.font.HelveticaNow[400]
+
+        letterSpacing: palette.letterSpacing.medium,
+        lineHeight: palette.lineHeight.ratio11to9
       }
     },
     {
       if: { size: 'display2', viewport: ['lg', 'xl'] },
       tokens: {
-        fontSize: fontSize.size56,
+        fontSize: palette.fontSize.size56,
+
+        // TODO: replace with font token
         fontWeight: '300',
-        lineHeight: lineHeight.ratio8to7,
-        letterSpacing: letterSpacing.condensed
+        // font: palette.font.HelveticaNow[300]
+
+        lineHeight: palette.lineHeight.ratio8to7,
+        letterSpacing: palette.letterSpacing.condensed
       }
     },
 
@@ -152,18 +167,22 @@ accessibility or SEO-related properties; use the heading prop if text should be
     {
       if: { size: 'h1' },
       tokens: {
-        fontSize: fontSize.size28,
-        lineHeight: lineHeight.ratio9to7,
-        letterSpacing: letterSpacing.loose
+        fontSize: palette.fontSize.size28,
+        lineHeight: palette.lineHeight.ratio9to7,
+        letterSpacing: palette.letterSpacing.loose
       }
     },
     {
       if: { size: 'h1', viewport: ['lg', 'xl'] },
       tokens: {
-        fontSize: fontSize.size40,
+        fontSize: palette.fontSize.size40,
+
+        // TODO: replace with font token
         fontWeight: '300',
-        lineHeight: lineHeight.ratio6to5,
-        letterSpacing: letterSpacing.medium
+        // font: palette.font.HelveticaNow[300]
+
+        lineHeight: palette.lineHeight.ratio6to5,
+        letterSpacing: palette.letterSpacing.medium
       }
     },
 
@@ -171,17 +190,21 @@ accessibility or SEO-related properties; use the heading prop if text should be
     {
       if: { size: 'h2' },
       tokens: {
-        fontSize: fontSize.size24,
+        fontSize: palette.fontSize.size24,
+
+        // TODO: replace with font token
         fontWeight: '500',
-        lineHeight: lineHeight.ratio4to3
+        // font: palette.font.HelveticaNow[500]
+
+        lineHeight: palette.lineHeight.ratio4to3
       }
     },
     {
       if: { size: 'h2', viewport: ['lg', 'xl'] },
       tokens: {
-        fontSize: fontSize.size28,
-        lineHeight: lineHeight.ratio9to7,
-        letterSpacing: letterSpacing.loose
+        fontSize: palette.fontSize.size28,
+        lineHeight: palette.lineHeight.ratio9to7,
+        letterSpacing: palette.letterSpacing.loose
       }
     },
 
@@ -189,16 +212,20 @@ accessibility or SEO-related properties; use the heading prop if text should be
     {
       if: { size: 'h3' },
       tokens: {
-        fontSize: fontSize.size20,
+        fontSize: palette.fontSize.size20,
+
+        // TODO: replace with font token
         fontWeight: '500',
-        lineHeight: lineHeight.ratio7to5
+        // font: palette.font.HelveticaNow[500]
+
+        lineHeight: palette.lineHeight.ratio7to5
       }
     },
     {
       if: { size: 'h3', viewport: ['lg', 'xl'] },
       tokens: {
-        fontSize: fontSize.size24,
-        lineHeight: lineHeight.ratio4to3
+        fontSize: palette.fontSize.size24,
+        lineHeight: palette.lineHeight.ratio4to3
       }
     },
 
@@ -206,9 +233,13 @@ accessibility or SEO-related properties; use the heading prop if text should be
     {
       if: { size: 'h4' },
       tokens: {
-        fontSize: fontSize.size16,
+        fontSize: palette.fontSize.size16,
+
+        // TODO: replace with font token
         fontWeight: '500',
-        lineHeight: lineHeight.ratio3to2
+        // font: palette.font.HelveticaNow[500]
+
+        lineHeight: palette.lineHeight.ratio3to2
       }
     },
 
@@ -216,9 +247,13 @@ accessibility or SEO-related properties; use the heading prop if text should be
     {
       if: { size: 'h5' },
       tokens: {
-        fontSize: fontSize.size14,
+        fontSize: palette.fontSize.size14,
+
+        // TODO: replace with font token
         fontWeight: '500',
-        lineHeight: lineHeight.ratio9to7
+        // font: palette.font.HelveticaNow[500]
+
+        lineHeight: palette.lineHeight.ratio9to7
       }
     },
 
@@ -226,9 +261,13 @@ accessibility or SEO-related properties; use the heading prop if text should be
     {
       if: { size: 'h6' },
       tokens: {
-        fontSize: fontSize.size12,
+        fontSize: palette.fontSize.size12,
+
+        // TODO: replace with font token
         fontWeight: '700',
-        lineHeight: lineHeight.ratio4to3
+        // font: palette.font.HelveticaNow[700]
+
+        lineHeight: palette.lineHeight.ratio4to3
       }
     },
 
@@ -236,14 +275,14 @@ accessibility or SEO-related properties; use the heading prop if text should be
     {
       if: { size: 'large' },
       tokens: {
-        fontSize: fontSize.size20,
-        lineHeight: lineHeight.ratio8to5
+        fontSize: palette.fontSize.size20,
+        lineHeight: palette.lineHeight.ratio8to5
       }
     },
     {
       if: { size: 'large', compact: true },
       tokens: {
-        lineHeight: lineHeight.ratio6to5
+        lineHeight: palette.lineHeight.ratio6to5
       }
     },
 
@@ -253,21 +292,21 @@ accessibility or SEO-related properties; use the heading prop if text should be
       description:
         "The compact line height for the 'default' font size, but doesn't apply for any other styles",
       tokens: {
-        lineHeight: lineHeight.ratio5to4
+        lineHeight: palette.lineHeight.ratio5to4
       }
     },
     /* small */
     {
       if: { size: 'small' },
       tokens: {
-        fontSize: fontSize.size14,
-        lineHeight: lineHeight.ratio10to7
+        fontSize: palette.fontSize.size14,
+        lineHeight: palette.lineHeight.ratio10to7
       }
     },
     {
       if: { size: 'small', compact: true },
       tokens: {
-        lineHeight: lineHeight.ratio8to7
+        lineHeight: palette.lineHeight.ratio8to7
       }
     },
 
@@ -275,9 +314,13 @@ accessibility or SEO-related properties; use the heading prop if text should be
     {
       if: { size: 'micro' },
       tokens: {
-        fontSize: fontSize.size12,
+        fontSize: palette.fontSize.size12,
+
+        // TODO: replace with font token
         fontWeight: '500',
-        lineHeight: lineHeight.ratio4to3
+        // font: palette.font.HelveticaNow[500]
+
+        lineHeight: palette.lineHeight.ratio4to3
       }
     },
 
@@ -285,10 +328,14 @@ accessibility or SEO-related properties; use the heading prop if text should be
     {
       if: { size: 'eyebrow' },
       tokens: {
-        fontSize: fontSize.size14,
+        fontSize: palette.fontSize.size14,
+
+        // TODO: replace with font token
         fontWeight: '700',
-        textTransform: 'uppercase',
-        lineHeight: lineHeight.ratio9to7
+        // font: palette.font.HelveticaNow[700]
+
+        textTransform: system.textTransform.uppercase,
+        lineHeight: palette.lineHeight.ratio9to7
       }
     },
 
@@ -299,23 +346,10 @@ accessibility or SEO-related properties; use the heading prop if text should be
       if: { size: ['large', null, 'small', 'micro'], bold: true },
       description: 'Bold is only available on body text styles, not headings',
       tokens: {
+        // TODO: replace with font token
         fontWeight: '700'
+        // font: palette.font.HelveticaNow[700]
       }
     }
   ]
 }
-
-// Subset of allowed colours
-const { greyCharcoal, greyShuttle, purpleTelus, greyThunder, white } = palette.color
-
-// TODO: replace this with a build step similar to Palettes
-// https://github.com/telus/universal-design-system/issues/167
-validateComponentTheme(
-  Typography,
-  getTypographySchema({
-    ...palette,
-    color: { greyCharcoal, greyShuttle, purpleTelus, greyThunder, white }
-  })
-)
-
-export default Typography

package/src/components/index.js

@@ -1,39 +1,37 @@
-import ActivityIndicator from './ActivityIndicator'
-import Box from './Box'
-import Button from './Button'
-import ButtonGroup from './ButtonGroup'
-import Divider from './Divider'
-import ExpandCollapse from './ExpandCollapse'
-import ExpandCollapseControl from './ExpandCollapseControl'
-import ExpandCollapsePanel from './ExpandCollapsePanel'
-import Icon from './Icon'
-import Link from './Link'
-import ToggleSwitch from './ToggleSwitch'
-import Typography from './Typography'
-import SideNav from './SideNav'
-import SideNavItem from './SideNavItem'
-import SideNavItemsGroup from './SideNavItemsGroup'
-import Pagination from './Pagination'
-import PaginationPageButton from './PaginationPageButton'
-import PaginationSideButton from './PaginationSideButton'
-
-export default {
-  ActivityIndicator,
-  Box,
-  Button,
-  ButtonGroup,
-  Divider,
-  ExpandCollapse,
-  ExpandCollapseControl,
-  ExpandCollapsePanel,
-  Icon,
-  Link,
-  Pagination,
-  PaginationPageButton,
-  PaginationSideButton,
-  SideNav,
-  SideNavItem,
-  SideNavItemsGroup,
-  ToggleSwitch,
-  Typography
-}
+export { default as ActivityIndicator } from './ActivityIndicator'
+export { default as Box } from './Box'
+export { default as Button } from './Button'
+export { default as ButtonGroup } from './ButtonGroup'
+export { default as ButtonGroupItem } from './ButtonGroupItem'
+export { default as Card } from './Card'
+export { default as Checkbox } from './Checkbox'
+export { default as ChevronLink } from './ChevronLink'
+export { default as Divider } from './Divider'
+export { default as ExpandCollapse } from './ExpandCollapse'
+export { default as ExpandCollapseControl } from './ExpandCollapseControl'
+export { default as ExpandCollapsePanel } from './ExpandCollapsePanel'
+export { default as Feedback } from './Feedback'
+export { default as Icon } from './Icon'
+export { default as InputLabel } from './InputLabel'
+export { default as InputSupports } from './InputSupports'
+export { default as Link } from './Link'
+export { default as List } from './List'
+export { default as Pagination } from './Pagination'
+export { default as PaginationPageButton } from './PaginationPageButton'
+export { default as PaginationSideButton } from './PaginationSideButton'
+export { default as Radio } from './Radio'
+export { default as Select } from './Select'
+export { default as SideNav } from './SideNav'
+export { default as SideNavItem } from './SideNavItem'
+export { default as SideNavItemsGroup } from './SideNavItemsGroup'
+export { default as Skeleton } from './Skeleton'
+export { default as StackView } from './StackView'
+export { default as Tags } from './Tags'
+export { default as TagsItem } from './TagsItem'
+export { default as TextArea } from './TextArea'
+export { default as TextInput } from './TextInput'
+export { default as ToggleSwitch } from './ToggleSwitch'
+export { default as Tooltip } from './Tooltip'
+export { default as TooltipButton } from './TooltipButton'
+export { default as Typography } from './Typography'
+export { default as spacingScale } from './spacingScale'

package/src/components/spacingScale.js

@@ -0,0 +1,36 @@
+import palette from '@telus-uds/palette-allium'
+import { appearances } from '@telus-uds/system-themes/schema'
+
+export default {
+  appearances: {
+    space: appearances.spacingScale.space,
+    viewport: appearances.system.viewport
+  },
+  // Largest spacings first, so they apply any time space >= highest index'
+  tokens: { size: palette.size.size96 },
+  rules: [
+    { if: { viewport: ['lg', 'xl'] }, tokens: { size: palette.size.size120 } },
+
+    { if: { space: 11 }, tokens: { size: palette.size.size96 } },
+    { if: { space: 10 }, tokens: { size: palette.size.size80 } },
+    { if: { space: 9 }, tokens: { size: palette.size.size64 } },
+    { if: { space: 8 }, tokens: { size: palette.size.size48 } },
+    { if: { space: 7 }, tokens: { size: palette.size.size40 } },
+    { if: { space: 6 }, tokens: { size: palette.size.size36 } },
+    { if: { space: 5 }, tokens: { size: palette.size.size32 } },
+    { if: { space: 4 }, tokens: { size: palette.size.size24 } },
+    { if: { space: 3 }, tokens: { size: palette.size.size16 } },
+    { if: { space: 2 }, tokens: { size: palette.size.size8 } },
+    { if: { space: 1 }, tokens: { size: palette.size.size4 } },
+
+    { if: { space: 11, viewport: ['lg', 'xl'] }, tokens: { size: palette.size.size120 } },
+    { if: { space: 10, viewport: ['lg', 'xl'] }, tokens: { size: palette.size.size96 } },
+    { if: { space: 9, viewport: ['lg', 'xl'] }, tokens: { size: palette.size.size72 } },
+    { if: { space: 8, viewport: ['lg', 'xl'] }, tokens: { size: palette.size.size64 } },
+    { if: { space: 7 }, tokens: { size: palette.size.size48 } },
+    { if: { space: 6 }, tokens: { size: palette.size.size40 } },
+
+    // Zero spacing last; overrides all other rules when space === 0
+    { if: { space: 0 }, tokens: { size: palette.size.size0 } }
+  ]
+}

package/src/index.js

@@ -1,5 +1,5 @@
 import packageJson from '../package.json'
-import components from './components'
+import * as components from './components'
 
 // TODO: replace this with theme build tooling and schema checks as part of
 // https://github.com/telus/universal-design-system/issues/92