WIP(shared-types,ui-drilldown,ui-top-nav-bar): add lti colors

Author: joyenjoyer

packages/__docs__/src/App/index.tsx

@@ -25,7 +25,7 @@
 /** @jsx jsx */
 import { Component } from 'react'
 import { Route, Routes, useNavigate } from 'react-router-dom'
-import { withStyle, jsx } from '@instructure/emotion'
+import { withStyle, jsx, InstUISettingsProvider } from '@instructure/emotion'
 import { CanvasTopNav, SubNav } from '@instructure/ui-top-nav-bar'
 import { IconButton } from '@instructure/ui-buttons'
 import {
@@ -40,6 +40,8 @@ import {
 import generateStyle from './styles'
 import generateComponentTheme from './theme'
 import { Img } from '@instructure/ui-img'
+import { Drilldown } from '@instructure/ui-drilldown'
+import { View } from '@instructure/ui-view'
 
 type AppProps = {
   navigate: (path: string, options?: { replace: boolean }) => void
@@ -108,12 +110,13 @@ class App extends Component<AppProps, AppState> {
     const isLightMode = true
 
     const brandSvg = (
-      <IconButton
-        screenReaderLabel="Canvas Brand"
+      <View
         href="#"
-        withBackground={false}
-        withBorder={false}
-        color={isLightMode ? 'secondary' : 'primary-inverse'}
+        tabIndex={0}
+        role="button"
+        position="relative"
+        borderRadius="small"
+        focusColor="inverse" // LTI eseten nincs itt inverse, kek marad a focusring
       >
         <svg
           viewBox="0 0 1920 1920"
@@ -124,9 +127,81 @@ class App extends Component<AppProps, AppState> {
         >
           <path d="M958.568 277.97C1100.42 277.97 1216.48 171.94 1233.67 34.3881 1146.27 12.8955 1054.57 0 958.568 0 864.001 0 770.867 12.8955 683.464 34.3881 700.658 171.94 816.718 277.97 958.568 277.97ZM35.8207 682.031C173.373 699.225 279.403 815.285 279.403 957.136 279.403 1098.99 173.373 1215.05 35.8207 1232.24 12.8953 1144.84 1.43262 1051.7 1.43262 957.136 1.43262 862.569 12.8953 769.434 35.8207 682.031ZM528.713 957.142C528.713 1005.41 489.581 1044.55 441.31 1044.55 393.038 1044.55 353.907 1005.41 353.907 957.142 353.907 908.871 393.038 869.74 441.31 869.74 489.581 869.74 528.713 908.871 528.713 957.142ZM1642.03 957.136C1642.03 1098.99 1748.06 1215.05 1885.61 1232.24 1908.54 1144.84 1920 1051.7 1920 957.136 1920 862.569 1908.54 769.434 1885.61 682.031 1748.06 699.225 1642.03 815.285 1642.03 957.136ZM1567.51 957.142C1567.51 1005.41 1528.38 1044.55 1480.11 1044.55 1431.84 1044.55 1392.71 1005.41 1392.71 957.142 1392.71 908.871 1431.84 869.74 1480.11 869.74 1528.38 869.74 1567.51 908.871 1567.51 957.142ZM958.568 1640.6C816.718 1640.6 700.658 1746.63 683.464 1884.18 770.867 1907.11 864.001 1918.57 958.568 1918.57 1053.14 1918.57 1146.27 1907.11 1233.67 1884.18 1216.48 1746.63 1100.42 1640.6 958.568 1640.6ZM1045.98 1480.11C1045.98 1528.38 1006.85 1567.51 958.575 1567.51 910.304 1567.51 871.172 1528.38 871.172 1480.11 871.172 1431.84 910.304 1392.71 958.575 1392.71 1006.85 1392.71 1045.98 1431.84 1045.98 1480.11ZM1045.98 439.877C1045.98 488.148 1006.85 527.28 958.575 527.28 910.304 527.28 871.172 488.148 871.172 439.877 871.172 391.606 910.304 352.474 958.575 352.474 1006.85 352.474 1045.98 391.606 1045.98 439.877ZM1441.44 1439.99C1341.15 1540.29 1333.98 1697.91 1418.52 1806.8 1579 1712.23 1713.68 1577.55 1806.82 1418.5 1699.35 1332.53 1541.74 1339.7 1441.44 1439.99ZM1414.21 1325.37C1414.21 1373.64 1375.08 1412.77 1326.8 1412.77 1278.53 1412.77 1239.4 1373.64 1239.4 1325.37 1239.4 1277.1 1278.53 1237.97 1326.8 1237.97 1375.08 1237.97 1414.21 1277.1 1414.21 1325.37ZM478.577 477.145C578.875 376.846 586.039 219.234 501.502 110.339 341.024 204.906 206.338 339.592 113.203 498.637 220.666 584.607 378.278 576.01 478.577 477.145ZM679.155 590.32C679.155 638.591 640.024 677.723 591.752 677.723 543.481 677.723 504.349 638.591 504.349 590.32 504.349 542.048 543.481 502.917 591.752 502.917 640.024 502.917 679.155 542.048 679.155 590.32ZM1440 475.712C1540.3 576.01 1697.91 583.174 1806.8 498.637 1712.24 338.159 1577.55 203.473 1418.51 110.339 1332.54 217.801 1341.13 375.413 1440 475.712ZM1414.21 590.32C1414.21 638.591 1375.08 677.723 1326.8 677.723 1278.53 677.723 1239.4 638.591 1239.4 590.32 1239.4 542.048 1278.53 502.917 1326.8 502.917 1375.08 502.917 1414.21 542.048 1414.21 590.32ZM477.145 1438.58C376.846 1338.28 219.234 1331.12 110.339 1415.65 204.906 1576.13 339.593 1710.82 498.637 1805.39 584.607 1696.49 577.443 1538.88 477.145 1438.58ZM679.155 1325.37C679.155 1373.64 640.024 1412.77 591.752 1412.77 543.481 1412.77 504.349 1373.64 504.349 1325.37 504.349 1277.1 543.481 1237.97 591.752 1237.97 640.024 1237.97 679.155 1277.1 679.155 1325.37Z" />
         </svg>
-      </IconButton>
+      </View>
     )
 
+    const menuArray: any = [
+      {
+        id: 'default',
+        options: [
+          {
+            id: 'account',
+            label: 'Account',
+            renderBeforeTitle: <IconUserLine />,
+            subPageId: 'account'
+          },
+          {
+            id: 'courses',
+            label: 'Courses',
+            renderBeforeTitle: <IconCoursesLine />,
+            subPageId: 'courses'
+          },
+          {
+            id: 'dashboard',
+            label: 'Dashboard',
+            renderBeforeTitle: <IconDashboardLine />,
+            onClick: () => {
+              this.props.navigate('/dashboard', { replace: true })
+              window.location.reload()
+            }
+          },
+          {
+            id: 'help',
+            label: 'Help',
+            renderBeforeTitle: <IconQuestionLine />,
+            onClick: () => alert('Help clicked')
+          }
+        ]
+      },
+      {
+        id: 'account',
+        title: 'Account',
+        renderBeforeMobileMenuItems: (
+          <div style={{ display: 'flex', justifyContent: 'center' }}>
+            <Img src="https://sbcf.fr/wp-content/uploads/2018/03/sbcf-default-avatar.png" />
+          </div>
+        ),
+        renderAfterMobileMenuItems: (
+          <p>
+            Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi
+            aliquet erat in orci semper fringilla. Nullam suscipit mollis mi, at
+            vehicula magna vulputate eu. Cras mattis felis id quam vehicula
+            euismod. Nulla dolor enim, ornare in odio a, molestie dictum ligula.
+            Nullam maximus et dolor eget porttitor. Vestibulum faucibus viverra
+            pellentesque. Duis lorem lectus, porta vitae aliquam vitae, vehicula
+            sagittis nulla. Aenean sagittis congue rhoncus. Cras laoreet eu
+            nulla eu dignissim. Maecenas sed massa nisi. Suspendisse
+            pellentesque, metus sed ultricies porta, justo tellus pulvinar diam,
+            ac ornare massa nibh quis purus. Duis erat ipsum, pellentesque in
+            diam non, luctus accumsan metus. In ipsum tellus, ullamcorper a
+            faucibus a, venenatis ut urna. Sed at rutrum turpis.
+          </p>
+        ),
+        options: [
+          { id: 'accountinfo1', label: 'Account info 1' },
+          { id: 'accountinfo2', label: 'Account info 2' }
+        ]
+      },
+      {
+        id: 'courses',
+        title: 'Courses',
+        options: [
+          { id: 'courses1', label: 'Courses1' },
+          { id: 'courses2', label: 'Courses2' }
+        ]
+      }
+    ]
+
     const menu: MenuCollection = {
       default: {
         items: [
@@ -149,9 +224,10 @@ class App extends Component<AppProps, AppState> {
           {
             label: 'Dashboard',
             renderBeforeLabel: <IconDashboardLine />,
-            onClick: () => {
+            onClick: (e) => {
+              e.preventDefault()
               this.props.navigate('/dashboard', { replace: true })
-              window.location.reload()
+              // window.location.reload()
             }
           },
           {
@@ -228,7 +304,7 @@ class App extends Component<AppProps, AppState> {
     }
 
     return (
-      <div
+      <InstUISettingsProvider
         style={{
           position: 'relative',
           width: '100%',
@@ -238,13 +314,13 @@ class App extends Component<AppProps, AppState> {
       >
         <CanvasTopNav
           brand={brandSvg}
-          lightMode={false}
+          lti={true}
           breadcrumb={{
             label: 'You are here:',
             links: [
               { href: '#', label: 'Student Forecast' },
               { href: '#', label: 'University of Utah' },
-              { href: '#', label: 'University of Colleges' }
+              { label: 'University of Colleges' }
             ]
           }}
           hamburgerOnClick={() => alert('Hamburger clicked')}
@@ -261,31 +337,29 @@ class App extends Component<AppProps, AppState> {
               onClick: () => alert('Alerts clicked')
             }
           ]}
-          mobileMenuBackNavigation={menu[this.getCurrentMenu()]?.backNavigation}
-          mobileMenu={menu[this.getCurrentMenu()].items}
-          beforeMobileMenuItems={
-            menu[this.getCurrentMenu()]?.renderBeforeMobileMenuItems
-          }
-          afterMobileMenuItems={
-            menu[this.getCurrentMenu()]?.renderAfterMobileMenuItems
-          }
-        />
-        <SubNav
-          menuItems={[
-            { title: 'Home', href: 'www.google.com', selected: true },
-            { title: 'Announcements', href: 'http://www.google.com' },
-            { title: 'Assignments', href: 'www.google.com' },
-            { title: 'Discussions', href: 'www.google.com' },
-            { title: 'Grades', href: 'www.google.com' },
-            { title: 'People', href: 'www.google.com' }
-          ]}
+          mobileMenu={menuArray}
         />
-
-        <Routes>
-          {/*<Route path="/" element={<h1>This is home</h1>} />*/}
-          <Route path="/dashboard" element={<h1>This is dashboard</h1>} />
-        </Routes>
-      </div>
+        <div style={{ display: 'flex' }}>
+          <SubNav
+            menuItems={[
+              { title: 'Home', href: '/', selected: true },
+              { title: 'Account', href: '/account' },
+              { title: 'Courses', href: '/courses' },
+              {
+                title: 'Dashboard',
+                onClick: () => this.props.navigate('/dashboard')
+              },
+              { title: 'Help', onClick: () => alert('Help clicked') }
+            ]}
+          />
+          <div style={{ padding: '30px' }}>
+            <Routes>
+              <Route path="/" element={<h1>This is home</h1>} />
+              <Route path="/dashboard" element={<h1>This is dashboard</h1>} />
+            </Routes>
+          </div>
+        </div>
+      </InstUISettingsProvider>
     )
   }
 }

packages/shared-types/src/ComponentThemeVariables.ts

@@ -561,6 +561,7 @@ export type DrilldownTheme = {
   labelInfoPadding: Spacing['small']
   labelInfoColor: Colors['contrasts']['grey5782']
   borderColor: Colors['contrasts']['grey3045']
+  headerTitleTextDecoration: string
 }
 
 export type FileDropTheme = {

packages/ui-drilldown/src/Drilldown/DrilldownPage/props.ts

@@ -89,6 +89,10 @@ type DrilldownPageOwnProps = {
    * Is the page disabled
    */
   disabled?: boolean
+
+  renderBeforeChildren?: () => React.ReactNode
+
+  renderAfterChildren?: () => React.ReactNode
 }
 
 type PropKeys = keyof DrilldownPageOwnProps
@@ -111,7 +115,9 @@ const propTypes: PropValidators<PropKeys> = {
   onHeaderActionClicked: PropTypes.func,
   onBackButtonClicked: PropTypes.func,
   withoutHeaderSeparator: PropTypes.bool,
-  disabled: PropTypes.bool
+  disabled: PropTypes.bool,
+  renderBeforeChildren: PropTypes.func,
+  renderAfterChildren: PropTypes.func
 }
 
 const allowedProps: AllowedPropKeys = [
@@ -123,7 +129,9 @@ const allowedProps: AllowedPropKeys = [
   'onHeaderActionClicked',
   'onBackButtonClicked',
   'withoutHeaderSeparator',
-  'disabled'
+  'disabled',
+  'renderBeforeChildren',
+  'renderAfterChildren'
 ]
 
 export type { DrilldownPageProps, PageChildren }

packages/ui-drilldown/src/Drilldown/index.tsx

@@ -456,12 +456,17 @@ class Drilldown extends Component<DrilldownProps, DrilldownState> {
         <DrilldownOption
           id={this._headerBackId}
           onOptionClick={this.handleBackButtonClick}
+          beforeLabelContentVAlign={'center'}
         >
           <div css={styles?.headerBack} role="presentation">
             {backButtonLabel}
           </div>
         </DrilldownOption>
       )
+
+      if (currentPage.renderBeforeChildren) {
+        headerChildren.push(currentPage.renderBeforeChildren())
+      }
     }
 
     // Header title
@@ -965,7 +970,8 @@ class Drilldown extends Component<DrilldownProps, DrilldownState> {
         lastItemWasSeparator = false
         return this.renderOption(child, getOptionProps, getDisabledOptionProps)
       } else {
-        return null
+        // eslint-disable-next-line react/jsx-key
+        return <Options.Item>{child}</Options.Item>
       }
     })
   }
@@ -1437,6 +1443,11 @@ class Drilldown extends Component<DrilldownProps, DrilldownState> {
             >
               <Options {...getListProps()} role="presentation" as={as}>
                 {this.renderList(getOptionProps, getDisabledOptionProps)}
+                {this.currentPage?.renderAfterChildren && (
+                  <Options.Item>
+                    {this.currentPage.renderAfterChildren()}
+                  </Options.Item>
+                )}
               </Options>
             </View>
           </View>

packages/ui-drilldown/src/Drilldown/styles.ts

@@ -51,7 +51,7 @@ const generateStyle = (
       label: 'drilldown',
       overflow: 'visible', // needed for focus ring!
       borderColor: componentTheme.borderColor,
-
+      background: '#334451',
       ...(hasHighlightedOption && {
         '&:focus::before': {
           display: 'none'
@@ -67,7 +67,8 @@ const generateStyle = (
     },
     headerTitle: {
       label: 'drilldown__headerTitle',
-      fontWeight: componentTheme.headerTitleFontWeight
+      fontWeight: componentTheme.headerTitleFontWeight,
+      textDecoration: componentTheme.headerTitleTextDecoration
     },
     optionContainer: {
       label: 'drilldown__optionContainer',

packages/ui-drilldown/src/Drilldown/theme.ts

@@ -38,7 +38,8 @@ const generateComponentTheme = (theme: Theme): DrilldownTheme => {
     headerActionColor: colors?.contrasts?.blue4570,
     labelInfoPadding: spacing?.small,
     labelInfoColor: colors?.contrasts?.grey5782,
-    borderColor: colors?.contrasts?.grey3045
+    borderColor: colors?.contrasts?.grey3045,
+    headerTitleTextDecoration: 'none'
   }
 
   return {