Fix/examples (#66)

* fix: fixed export types * fix: fixed export types
openkitrun · Jan 5, 2024 · b4d118c · b4d118c
1 parent a86f02a
commit b4d118c
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 79 deletions.
diff --git a/.changeset/old-dryers-pull.md b/.changeset/old-dryers-pull.md
@@ -0,0 +1,14 @@
+---
+"@design-blocks/unstyled": patch
+"tsconfig": patch
+"@design-blocks/colors": patch
+"@design-blocks/primitives": patch
+"@design-blocks/system": patch
+"@design-blocks/theme": patch
+"@design-blocks/types": patch
+"@design-blocks/utils": patch
+"@design-blocks/block": patch
+"@design-blocks/native": patch
+---
+
+Fixed export types
diff --git a/examples/basic/App.tsx b/examples/basic/App.tsx
@@ -1,7 +1,8 @@
 import React from 'react';
-import { StatusBar } from 'expo-status-bar';
 import { SafeAreaView, useColorScheme } from 'react-native';
 
+import { StatusBar } from 'expo-status-bar';
+
 import { ThemeProvider } from '@design-blocks/native';
 
 import { themes, block } from './blocks.config';

diff --git a/examples/basic/block.d.ts b/examples/basic/block.d.ts
@@ -1,27 +1,24 @@
-import "@design-blocks/native";
+import '@design-blocks/native';
 
-import * as RN from "react-native";
+import * as RN from 'react-native';
 
-import { lightTheme, darkTheme } from "./blocks.config";
+import { lightTheme, darkTheme } from './blocks.config';
 
-import type { Leaves, LooseAutocomplete } from "@design-blocks/native";
-import type { TailwindCssColors } from "@design-blocks/colors";
+import type { Leaves, LooseAutocomplete, ColorMapProps } from '@design-blocks/native';
 
 type AppTheme = typeof lightTheme.tokens &
   typeof lightTheme.extendTokens &
   typeof darkTheme.tokens &
   typeof darkTheme.extendTokens;
 
-type ColorsAppTheme = AppTheme["colors"];
-type SpacingsCustom = AppTheme["spacings"];
-type RadiiCustom = AppTheme["radii"];
-type FontSizesCustom = AppTheme["fontSizes"];
-type ColorsValueMap =
-  | LooseAutocomplete<Leaves<ColorsAppTheme>>
-  | Omit<RN.TextStyle["color"], "string">;
+type ColorsAppTheme = typeof lightTheme.tokens.colors | typeof lightTheme.tokens.colors;
+type SpacingsCustom = AppTheme['spacings'];
+type RadiiCustom = AppTheme['radii'];
+type FontSizesCustom = AppTheme['fontSizes'];
+type ColorsValueMap = LooseAutocomplete<Leaves<ColorsAppTheme>> | Omit<RN.TextStyle['color'], 'string'>;
 
-declare module "@design-blocks/native" {
-  export interface Colors extends TailwindCssColors, ColorsAppTheme {}
+declare module '@design-blocks/native' {
+  export interface Colors extends ColorsAppTheme {}
   export interface Spacings extends SpacingsCustom {}
   export interface Radii extends RadiiCustom {}
   export interface FontSizes extends FontSizesCustom {}

diff --git a/examples/basic/blocks.config.ts b/examples/basic/blocks.config.ts
@@ -26,10 +26,6 @@ export const darkTheme = {
   tokens: {
     colors: {
       ...colors,
-      blue: {
-        ...colors.blue,
-        950: 'red',
-      },
     },
   },
   extendTokens: {

diff --git a/examples/basic/src/screens/DS/screen.tsx b/examples/basic/src/screens/DS/screen.tsx
diff --git a/examples/basic/src/screens/demo/screen.tsx b/examples/basic/src/screens/demo/screen.tsx
diff --git a/packages/@blocks-unstyled/src/Button/ButtonContext.tsx b/packages/@blocks-unstyled/src/Button/ButtonContext.tsx
@@ -2,6 +2,6 @@ import { createContext } from 'react';
 
 import type { ButtonContextProps } from './Button.types';
 
-export const ButtonContext = createContext<ButtonContextProps>(null as any);
+export const ButtonContext = createContext<ButtonContextProps>({});
 
 ButtonContext.displayName = 'Block.ButtonContext';
diff --git a/packages/@blocks-unstyled/src/Button/ButtonRoot.tsx b/packages/@blocks-unstyled/src/Button/ButtonRoot.tsx
@@ -32,6 +32,8 @@ export function ButtonRoot({
       <Pressable
         nativeID={nativeID}
         testID={testID}
+        aria-busy={accessible && accessibilityState.busy}
+        aria-disabled={accessible && accessibilityState.disabled}
         accessible={accessible}
         accessibilityRole={accessibilityRole}
         accessibilityState={accessibilityState}

diff --git a/packages/tsconfig/base.json b/packages/tsconfig/base.json
@@ -1,8 +1,6 @@
 {
   "$schema": "http://json.schemastore.org/tsconfig",
   "compilerOptions": {
-    "experimentalDecorators": true,
-    "declaration": true,
     "allowUnreachableCode": false,
     "allowUnusedLabels": false,
     "esModuleInterop": true,