@codeleap/styles 4.2.17 → 4.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codeleap/styles",
-  "version": "4.2.17",
+  "version": "4.3.0",
   "main": "src/index.ts",
   "license": "UNLICENSED",
   "repository": {
@@ -9,11 +9,11 @@
     "directory": "packages/styles"
   },
   "devDependencies": {
-    "@codeleap/config": "4.2.17",
+    "@codeleap/config": "4.3.0",
     "ts-node-dev": "1.1.8"
   },
   "scripts": {
-    "build": "echo \"No build script specified\"",
+    "build": "echo 'No build needed'",
     "lint": "eslint -c  .eslintrc.js --fix \"./src/**/*.{ts,tsx,js,jsx}\"",
     "test": "./node_modules/.bin/mocha --require ts-node/register src/tests/**/*.spec.ts",
     "run-sc": "tsnd --transpile-only",

package/package.json.bak

@@ -1,6 +1,6 @@
 {
   "name": "@codeleap/styles",
-  "version": "4.2.17",
+  "version": "4.3.0",
   "main": "src/index.ts",
   "license": "UNLICENSED",
   "repository": {
@@ -13,7 +13,7 @@
     "ts-node-dev": "1.1.8"
   },
   "scripts": {
-    "build": "echo \"No build script specified\"",
+    "build": "echo 'No build needed'",
     "lint": "eslint -c  .eslintrc.js --fix \"./src/**/*.{ts,tsx,js,jsx}\"",
     "test": "./node_modules/.bin/mocha --require ts-node/register src/tests/**/*.spec.ts",
     "run-sc": "tsnd --transpile-only",

package/src/lib/StyleRegistry.ts

@@ -30,7 +30,7 @@ export class CodeleapStyleRegistry {
 
     this.registerCommonVariants()
 
-    const currentColorScheme = this.theme?.current?.['currentColorScheme'] ?? this.theme?.colorScheme ?? 'default'
+    const currentColorScheme = this.theme?.current?.['currentColorScheme']?.() ?? this.theme?.colorScheme ?? 'default'
 
     this.styleCache.registerBaseKey([currentColorScheme, this.theme.current, this.commonVariants])
   }
@@ -515,7 +515,7 @@ export class CodeleapStyleRegistry {
   update() {
     this.theme = themeStore.getState()
 
-    const currentColorScheme = this.theme?.current?.['currentColorScheme'] ?? this.theme?.colorScheme ?? 'default'
+    const currentColorScheme = this.theme?.current?.['currentColorScheme']?.() ?? this.theme?.colorScheme ?? 'default'
 
     this.styleCache.registerBaseKey([currentColorScheme, this.theme.current, this.commonVariants])
   }

package/src/lib/createTheme.ts

@@ -24,9 +24,10 @@ export const createTheme = <T extends Theme>(theme: T, colorSchemaPersistor: Col
     ...otherThemeValues
   } = theme
 
-  const themeObj:AppTheme<T> = {
+  const themeObj: AppTheme<T> = {
     ...otherThemeValues,
-    get currentColorScheme(): string {
+
+    currentColorScheme() {
       return themeStore.getState().colorScheme
     },
 

package/src/lib/hooks.ts

@@ -26,9 +26,9 @@ export function useNestedStylesByKey<T extends string>(match: string, componentS
   }, [styles])
 }
 
-type ThemeSelector<T extends Record<string, any>> = (store: ThemeStore) => T
+type ThemeSelector<T = Record<string, any>> = (store: ThemeStore) => T
 
-export const useTheme = <T extends Record<string, any>>(selector: ThemeSelector<T>): T => {
+export const useTheme = <T = Record<string, any>>(selector: ThemeSelector<T>): T => {
   return themeStore(useShallow(selector))
 }
 

package/src/types/theme.ts

@@ -69,7 +69,7 @@ type PredefinedThemeDerivedValues<T extends Theme> = {
 
 type PredefinedAppTheme<T extends Theme> = PredefinedThemeDerivedValues<T> & {
   setColorScheme: (colorScheme: ColorScheme<T>) => void
-  currentColorScheme: ColorScheme<T>
+  currentColorScheme: () => ColorScheme<T>
   spacing: SpacingMap
   media: MediaQueries
   border: BorderCreator