@tamagui/themes 1.50.3 → 1.51.0

package/src/masks.tsx

@@ -32,6 +32,28 @@ export const masks = {
       borderColorFocus: softer.borderColorFocus,
     }
   }),
+  soften2Border1: createMask((template, options) => {
+    const softer2 = createSoftenMask({ strength: 2 }).mask(template, options)
+    const softer1 = createSoftenMask({ strength: 1 }).mask(template, options)
+    return {
+      ...softer2,
+      borderColor: softer1.borderColor,
+      borderColorHover: softer1.borderColorHover,
+      borderColorPress: softer1.borderColorPress,
+      borderColorFocus: softer1.borderColorFocus,
+    }
+  }),
+  soften3FlatBorder: createMask((template, options) => {
+    const borderMask = createSoftenMask({ strength: 2 }).mask(template, options)
+    const softer3 = createSoftenMask({ strength: 3 }).mask(template, options)
+    return {
+      ...softer3,
+      borderColor: borderMask.borderColor,
+      borderColorHover: borderMask.borderColorHover,
+      borderColorPress: borderMask.borderColorPress,
+      borderColorFocus: borderMask.borderColorFocus,
+    }
+  }),
   softenBorder: createMask((template, options) => {
     const plain = skipMask.mask(template, options)
     const softer = createSoftenMask().mask(template, options)

package/src/themes-v2.ts

@@ -0,0 +1,180 @@
+import { createThemeBuilder } from '@tamagui/theme-builder'
+
+import { overlayThemeDefinitions } from './componentThemeDefinitions'
+import { masks } from './masks'
+import { palettes } from './palettes'
+import { shadows } from './shadows'
+import { maskOptions, templates } from './templates'
+import { darkColors, lightColors } from './tokens'
+
+const colorThemeDefinition = (colorName: string) => [
+  {
+    parent: 'light',
+    palette: colorName,
+    template: 'colorLight',
+  },
+  {
+    parent: 'dark',
+    palette: colorName,
+    template: 'base',
+  },
+]
+
+const themesBuilder = createThemeBuilder()
+  .addPalettes(palettes)
+  .addTemplates(templates)
+  .addMasks(masks)
+  .addThemes({
+    light: {
+      template: 'base',
+      palette: 'light',
+      nonInheritedValues: {
+        ...lightColors,
+        ...shadows.light,
+      },
+    },
+    dark: {
+      template: 'base',
+      palette: 'dark',
+      nonInheritedValues: {
+        ...darkColors,
+        ...shadows.dark,
+      },
+    },
+  })
+  .addChildThemes({
+    orange: colorThemeDefinition('orange'),
+    yellow: colorThemeDefinition('yellow'),
+    green: colorThemeDefinition('green'),
+    blue: colorThemeDefinition('blue'),
+    purple: colorThemeDefinition('purple'),
+    pink: colorThemeDefinition('pink'),
+    red: colorThemeDefinition('red'),
+  })
+  .addChildThemes({
+    alt1: {
+      mask: 'soften',
+      ...maskOptions.alt,
+    },
+    alt2: {
+      mask: 'soften2Border1',
+      ...maskOptions.alt,
+    },
+    active: {
+      mask: 'soften3FlatBorder',
+      skip: {
+        color: 1,
+      },
+    },
+  })
+  .addChildThemes(
+    {
+      ListItem: [
+        {
+          parent: 'light',
+          mask: 'strengthen',
+          ...maskOptions.component,
+        },
+        {
+          parent: 'dark',
+          mask: 'identity',
+          ...maskOptions.component,
+        },
+      ],
+
+      Card: {
+        mask: 'soften',
+        ...maskOptions.component,
+      },
+
+      Button: {
+        mask: 'soften2Border1',
+        ...maskOptions.component,
+      },
+
+      Checkbox: {
+        mask: 'softenBorder2',
+        ...maskOptions.component,
+      },
+
+      Switch: {
+        mask: 'soften2Border1',
+        ...maskOptions.component,
+      },
+
+      SwitchThumb: {
+        mask: 'inverseStrengthen2',
+        ...maskOptions.component,
+      },
+
+      TooltipContent: {
+        mask: 'soften2Border1',
+        ...maskOptions.component,
+      },
+
+      DrawerFrame: {
+        mask: 'soften',
+        ...maskOptions.component,
+      },
+
+      Progress: {
+        mask: 'soften',
+        ...maskOptions.component,
+      },
+
+      RadioGroupItem: {
+        mask: 'softenBorder2',
+        ...maskOptions.component,
+      },
+
+      TooltipArrow: {
+        mask: 'soften',
+        ...maskOptions.component,
+      },
+
+      SliderTrackActive: {
+        mask: 'inverseSoften',
+        ...maskOptions.component,
+      },
+
+      SliderTrack: {
+        mask: 'soften2Border1',
+        ...maskOptions.component,
+      },
+
+      SliderThumb: {
+        mask: 'inverse',
+        ...maskOptions.component,
+      },
+
+      Tooltip: {
+        mask: 'inverse',
+        ...maskOptions.component,
+      },
+
+      ProgressIndicator: {
+        mask: 'inverse',
+        ...maskOptions.component,
+      },
+
+      SheetOverlay: overlayThemeDefinitions,
+      DialogOverlay: overlayThemeDefinitions,
+      ModalOverlay: overlayThemeDefinitions,
+
+      Input: {
+        mask: 'softenBorder2',
+        ...maskOptions.component,
+      },
+
+      TextArea: {
+        mask: 'softenBorder2',
+        ...maskOptions.component,
+      },
+    },
+    {
+      // to save bundle size but make alt themes not work on components
+      // avoidNestingWithin: ['alt1', 'alt2'],
+    }
+  )
+
+export const themes = themesBuilder.build()

package/src/v2.tsx

@@ -0,0 +1,21 @@
+import * as themes from './generated-v2'
+export { themes }
+
+// export { themes } from './themes-new'
+
+export * from './tokens'
+export * from './masks'
+export * from './componentThemeDefinitions'
+export * from './palettes'
+export * from './templates'
+export * from './shadows'
+
+// specific colors since we have cjs here
+export { blue, blueDark } from '@tamagui/colors'
+export { green, greenDark } from '@tamagui/colors'
+export { red, redDark } from '@tamagui/colors'
+export { orange, orangeDark } from '@tamagui/colors'
+export { yellow, yellowDark } from '@tamagui/colors'
+export { pink, pinkDark } from '@tamagui/colors'
+export { purple, purpleDark } from '@tamagui/colors'
+export { gray, grayDark } from '@tamagui/colors'