baseui 0.0.0-next-79ec2e2 → 0.0.0-next-b71c7ca

package/es/list/styled-components.js

@@ -25,7 +25,10 @@ export const StyledRoot = styled('li', ({
     overflow: 'hidden',
     ...($isTapTarget ? {
       // button style reset
-      borderRadius: 0,
+      borderTopLeftRadius: 0,
+      borderTopRightRadius: 0,
+      borderBottomLeftRadius: 0,
+      borderBottomRightRadius: 0,
       textAlign: 'inherit',
       boxShadow: 'none',
       padding: 0,

package/es/themes/dark-theme/create-dark-theme.js

@@ -12,7 +12,7 @@ import defaultFoundationColorTokens from './color-tokens';
 import { colors as primitiveColorTokens } from '../../tokens';
 import getComponentColorTokens from './color-component-tokens';
 import getSemanticColorTokens from './color-semantic-tokens';
-import getTypography from '../shared/typography';
+import typography from '../shared/typography';
 import grid from '../shared/grid';
 import lighting from '../shared/lighting';
 import mediaQuery from '../shared/media-query';
@@ -43,10 +43,7 @@ overrides) {
     lighting,
     mediaQuery,
     sizing,
-    // If primaryFontFamily is not provided, we use our default font tokens
-    typography: primaryFontFamily ? getTypography({
-      primaryFontFamily
-    }) : getTypography(),
+    typography,
     // TODO(#2318) Remove in v11, the next major version.
     // Do not use.
     zIndex: {

package/es/themes/dark-theme/dark-theme.js

@@ -10,7 +10,7 @@ import getSemanticColorTokens from './color-semantic-tokens';
 import getComponentColorTokens from './color-component-tokens';
 import borders from './borders';
 import lighting from '../shared/lighting';
-import getTypography from '../shared/typography';
+import typography from '../shared/typography';
 import animation from '../shared/animation';
 import breakpoints from '../shared/breakpoints';
 import grid from '../shared/grid';
@@ -31,7 +31,7 @@ export const DarkTheme = {
   lighting,
   mediaQuery,
   sizing,
-  typography: getTypography(),
+  typography,
   // TODO(#2318) Remove it in the next v11 major version.
   // Do not use.
   zIndex: {

package/es/themes/dark-theme/primitives.js

@@ -5,10 +5,10 @@ This source code is licensed under the MIT license found in the
 LICENSE file in the root directory of this source tree.
 */
 import defaultFoundationColorTokens from './color-tokens';
-import { defaultFontTokens } from '../shared/typography';
+import { fontTokens } from '../shared/typography';
 // We don't use this ourselves. We provide it for backward compatibility.
 // People may have used it to create their own custom theme.
 const primitives = { ...defaultFoundationColorTokens,
-  ...defaultFontTokens
+  ...fontTokens
 };
 export default primitives;

package/es/themes/light-theme/create-light-theme.js

@@ -12,7 +12,7 @@ import defaultFoundationColorTokens from './color-tokens';
 import { colors as primitiveColorTokens } from '../../tokens';
 import getComponentColorTokens from './color-component-tokens';
 import getSemanticColorTokens from './color-semantic-tokens';
-import getTypography from '../shared/typography';
+import typography from '../shared/typography';
 import grid from '../shared/grid';
 import lighting from '../shared/lighting';
 import mediaQuery from '../shared/media-query';
@@ -43,10 +43,7 @@ overrides) {
     lighting,
     mediaQuery,
     sizing,
-    // If primaryFontFamily is not provided, we use our default font tokens
-    typography: primaryFontFamily ? getTypography({
-      primaryFontFamily
-    }) : getTypography(),
+    typography,
     // TODO(#2318) Remove in v11, the next major version.
     // Do not use.
     zIndex: {

package/es/themes/light-theme/light-theme.js

@@ -10,7 +10,7 @@ import getSemanticColorTokens from './color-semantic-tokens';
 import getComponentColorTokens from './color-component-tokens';
 import borders from '../shared/borders';
 import lighting from '../shared/lighting';
-import getTypography from '../shared/typography';
+import typography from '../shared/typography';
 import animation from '../shared/animation';
 import breakpoints from '../shared/breakpoints';
 import grid from '../shared/grid';
@@ -31,7 +31,7 @@ export const LightTheme = {
   lighting,
   mediaQuery,
   sizing,
-  typography: getTypography(),
+  typography,
   // TODO(#2318) Remove it in the next v11 major version.
   // Do not use.
   zIndex: {

package/es/themes/light-theme/primitives.js

@@ -5,10 +5,10 @@ This source code is licensed under the MIT license found in the
 LICENSE file in the root directory of this source tree.
 */
 import defaultFoundationColorTokens from './color-tokens';
-import { defaultFontTokens } from '../shared/typography';
+import { fontTokens } from '../shared/typography';
 // We don't use this ourselves. We provide it for backward compatibility.
 // People may have used it to create their own custom theme.
 const primitives = { ...defaultFoundationColorTokens,
-  ...defaultFontTokens
+  ...fontTokens
 };
 export default primitives;

package/es/themes/move-theme/dark-theme-with-move.js

@@ -6,16 +6,6 @@ LICENSE file in the root directory of this source tree.
 */
 import deepMerge from '../../utils/deep-merge';
 import { DarkTheme } from '../dark-theme/dark-theme';
-import { typography as moveTypography, fontTokens as moveFontTokens } from './typography';
-import getTypography from '../shared/typography';
 export const DarkThemeMove = deepMerge({}, DarkTheme, {
-  name: 'dark-theme-with-move',
-  // For the move theme we need to override typography values
-  // in the default darkTheme with a font values that reference
-  // our custom font family. In addition to it we want to replace some
-  // of the fonts with an additional secondary font that specified
-  // in `moveTypography`. For it we'll get the typography value built
-  // with a custom font using `getTypography` helper and extend the result
-  // value with the customized set of fonts that reference a secondary font
-  typography: deepMerge(getTypography(moveFontTokens), moveTypography)
+  name: 'dark-theme-with-move'
 });

package/es/themes/move-theme/light-theme-with-move.js

@@ -6,16 +6,6 @@ LICENSE file in the root directory of this source tree.
 */
 import deepMerge from '../../utils/deep-merge';
 import { LightTheme } from '../light-theme/light-theme';
-import { typography as moveTypography, fontTokens as moveFontTokens } from './typography';
-import getTypography from '../shared/typography';
 export const LightThemeMove = deepMerge({}, LightTheme, {
-  name: 'light-theme-with-move',
-  // For the move theme we need to override typography values
-  // in the default lightTheme with a font values that reference
-  // our custom font family. In addition to it we want to replace some
-  // of the fonts with an additional secondary font that specified
-  // in `moveTypography`. For it we'll get the typography value built
-  // with a custom font using `getTypography` helper and extend the result
-  // value with the customized set of fonts that reference a secondary font
-  typography: deepMerge(getTypography(moveFontTokens), moveTypography)
+  name: 'light-theme-with-move'
 });

package/es/themes/move-theme/typography.js

@@ -5,123 +5,123 @@ This source code is licensed under the MIT license found in the
 LICENSE file in the root directory of this source tree.
 */
 export const fontTokens = {
-  primaryFontFamily: 'UberMoveText, system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif'
+  primaryFontFamily: 'UberMoveText, system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif',
+  secondaryFontFamily: 'UberMove, UberMoveText, system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif',
+  monoFontFamily: 'UberMoveMono, "Lucida Console", Monaco, monospace'
 };
-const secondaryFontFamily = 'UberMove, UberMoveText, system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif';
-const monoFontFamily = 'UberMoveMono, "Lucida Console", Monaco, monospace';
 export const typography = {
   font1450: {
-    fontFamily: secondaryFontFamily
+    fontFamily: fontTokens.secondaryFontFamily
   },
   font1350: {
-    fontFamily: secondaryFontFamily
+    fontFamily: fontTokens.secondaryFontFamily
   },
   font1250: {
-    fontFamily: secondaryFontFamily
+    fontFamily: fontTokens.secondaryFontFamily
   },
   font1150: {
-    fontFamily: secondaryFontFamily
+    fontFamily: fontTokens.secondaryFontFamily
   },
   font1050: {
-    fontFamily: secondaryFontFamily
+    fontFamily: fontTokens.secondaryFontFamily
   },
   font950: {
-    fontFamily: secondaryFontFamily
+    fontFamily: fontTokens.secondaryFontFamily
   },
   font850: {
-    fontFamily: secondaryFontFamily
+    fontFamily: fontTokens.secondaryFontFamily
   },
   font750: {
-    fontFamily: secondaryFontFamily
+    fontFamily: fontTokens.secondaryFontFamily
   },
   font650: {
-    fontFamily: secondaryFontFamily
+    fontFamily: fontTokens.secondaryFontFamily
   },
   font550: {
-    fontFamily: secondaryFontFamily
+    fontFamily: fontTokens.secondaryFontFamily
   },
   DisplayLarge: {
-    fontFamily: secondaryFontFamily
+    fontFamily: fontTokens.secondaryFontFamily
   },
   DisplayMedium: {
-    fontFamily: secondaryFontFamily
+    fontFamily: fontTokens.secondaryFontFamily
   },
   DisplaySmall: {
-    fontFamily: secondaryFontFamily
+    fontFamily: fontTokens.secondaryFontFamily
   },
   DisplayXSmall: {
-    fontFamily: secondaryFontFamily
+    fontFamily: fontTokens.secondaryFontFamily
   },
   HeadingXXLarge: {
-    fontFamily: secondaryFontFamily
+    fontFamily: fontTokens.secondaryFontFamily
   },
   HeadingXLarge: {
-    fontFamily: secondaryFontFamily
+    fontFamily: fontTokens.secondaryFontFamily
   },
   HeadingLarge: {
-    fontFamily: secondaryFontFamily
+    fontFamily: fontTokens.secondaryFontFamily
   },
   HeadingMedium: {
-    fontFamily: secondaryFontFamily
+    fontFamily: fontTokens.secondaryFontFamily
   },
   HeadingSmall: {
-    fontFamily: secondaryFontFamily
+    fontFamily: fontTokens.secondaryFontFamily
   },
   HeadingXSmall: {
-    fontFamily: secondaryFontFamily
+    fontFamily: fontTokens.secondaryFontFamily
   },
   MonoParagraphXSmall: {
-    fontFamily: monoFontFamily
+    fontFamily: fontTokens.monoFontFamily
   },
   MonoParagraphSmall: {
-    fontFamily: monoFontFamily
+    fontFamily: fontTokens.monoFontFamily
   },
   MonoParagraphMedium: {
-    fontFamily: monoFontFamily
+    fontFamily: fontTokens.monoFontFamily
   },
   MonoParagraphLarge: {
-    fontFamily: monoFontFamily
+    fontFamily: fontTokens.monoFontFamily
   },
   MonoLabelXSmall: {
-    fontFamily: monoFontFamily
+    fontFamily: fontTokens.monoFontFamily
   },
   MonoLabelSmall: {
-    fontFamily: monoFontFamily
+    fontFamily: fontTokens.monoFontFamily
   },
   MonoLabelMedium: {
-    fontFamily: monoFontFamily
+    fontFamily: fontTokens.monoFontFamily
   },
   MonoLabelLarge: {
-    fontFamily: monoFontFamily
+    fontFamily: fontTokens.monoFontFamily
   },
   MonoHeadingXSmall: {
-    fontFamily: monoFontFamily
+    fontFamily: fontTokens.monoFontFamily
   },
   MonoHeadingSmall: {
-    fontFamily: monoFontFamily
+    fontFamily: fontTokens.monoFontFamily
   },
   MonoHeadingMedium: {
-    fontFamily: monoFontFamily
+    fontFamily: fontTokens.monoFontFamily
   },
   MonoHeadingLarge: {
-    fontFamily: monoFontFamily
+    fontFamily: fontTokens.monoFontFamily
   },
   MonoHeadingXLarge: {
-    fontFamily: monoFontFamily
+    fontFamily: fontTokens.monoFontFamily
   },
   MonoHeadingXXLarge: {
-    fontFamily: monoFontFamily
+    fontFamily: fontTokens.monoFontFamily
   },
   MonoDisplayXSmall: {
-    fontFamily: monoFontFamily
+    fontFamily: fontTokens.monoFontFamily
   },
   MonoDisplaySmall: {
-    fontFamily: monoFontFamily
+    fontFamily: fontTokens.monoFontFamily
   },
   MonoDisplayMedium: {
-    fontFamily: monoFontFamily
+    fontFamily: fontTokens.monoFontFamily
   },
   MonoDisplayLarge: {
-    fontFamily: monoFontFamily
+    fontFamily: fontTokens.monoFontFamily
   }
 };