fix(themes): add theme types #51

Author: rwieruch

.storybook/stories/Themes/Libraries/chakra-ui/editable.js

@@ -102,7 +102,7 @@ import * as React from 'react';
 
 import { CompactTable } from '@table-library/react-table-library/compact';
 import { useTheme } from '@table-library/react-table-library/theme';
-import { DEFAULT_OPTIONS, getTheme } from '@table-library/react-table-library/themes/chakra';
+import { DEFAULT_OPTIONS, getTheme } from '@table-library/react-table-library/chakra';
 
 import { DocumentationSee } from '../../../documentation';
 import { nodes } from '../../../data';

.storybook/stories/Themes/Libraries/material-ui/editable.js

@@ -102,7 +102,7 @@ import * as React from 'react';
 
 import { CompactTable } from '@table-library/react-table-library/compact';
 import { useTheme } from '@table-library/react-table-library/theme';
-import { DEFAULT_OPTIONS, getTheme } from '@table-library/react-table-library/themes/material';
+import { DEFAULT_OPTIONS, getTheme } from '@table-library/react-table-library/material';
 
 import { DocumentationSee } from '../../../documentation';
 import { nodes } from '../../../data';

babel.config.cjs

@@ -19,10 +19,10 @@ module.exports = {
           '@table-library/react-table-library/tree': './src/tree',
           '@table-library/react-table-library/pagination': './src/pagination',
           // themes
-          '@table-library/react-table-library/baseline': './src/themes/baseline',
-          '@table-library/react-table-library/mantine': './src/themes/mantine',
-          '@table-library/react-table-library/chakra-ui': './src/themes/chakra-ui',
-          '@table-library/react-table-library/material-ui': './src/themes/material-ui',
+          '@table-library/react-table-library/baseline': './src/baseline',
+          '@table-library/react-table-library/mantine': './src/mantine',
+          '@table-library/react-table-library/chakra-ui': './src/chakra-ui',
+          '@table-library/react-table-library/material-ui': './src/material-ui',
         },
       },
     ],

rollup.config.js

@@ -33,10 +33,10 @@ export default {
     tree: './src/tree/index.ts',
     pagination: './src/pagination/index.ts',
     // themes
-    baseline: './src/themes/baseline/index.ts',
-    mantine: './src/themes/mantine/index.ts',
-    ['chakra-ui']: './src/themes/chakra-ui/index.ts',
-    ['material-ui']: './src/themes/material-ui/index.ts',
+    baseline: './src/baseline/index.ts',
+    mantine: './src/mantine/index.ts',
+    ['chakra-ui']: './src/chakra-ui/index.ts',
+    ['material-ui']: './src/material-ui/index.ts',
   },
   output: [
     // ES module version, for modern browsers

src/themes/baseline/index.ts renamed to src/baseline/index.ts

@@ -1,6 +1,8 @@
 import * as COLORS from '@table-library/react-table-library/common/colors';
 import { zipThemes } from '@table-library/react-table-library/theme/index';
 
+import { Theme } from '@table-library/react-table-library/types/theme';
+
 const GUTTER = 6;
 
 const BASELINE_THEME = {
@@ -74,6 +76,6 @@ const BASELINE_THEME = {
   Cell: '',
 };
 
-export const getTheme = () => {
+export const getTheme = (): Theme => {
   return zipThemes([BASELINE_THEME]);
 };

src/themes/chakra-ui/index.ts renamed to src/chakra-ui/index.ts

@@ -1,5 +1,7 @@
 import { zipThemes } from '@table-library/react-table-library/theme/index';
 
+import { Theme } from '@table-library/react-table-library/types/theme';
+
 type Configuration = {
   isVirtualized?: boolean;
 };
@@ -134,7 +136,7 @@ export const DEFAULT_CONFIGURATION = {
   isVirtualized: false,
 };
 
-export const getTheme = (options?: Options, configuration?: Configuration) => {
+export const getTheme = (options?: Options, configuration?: Configuration): Theme => {
   const mergedOptions = {
     ...DEFAULT_OPTIONS,
     ...(options ? options : {}),

src/themes/mantine/index.ts renamed to src/mantine/index.ts

@@ -1,5 +1,7 @@
 import { zipThemes } from '@table-library/react-table-library/theme/index';
 
+import { Theme } from '@table-library/react-table-library/types/theme';
+
 type Configuration = {
   isVirtualized?: boolean;
 };
@@ -139,18 +141,18 @@ const getZipTheme = (options: OptionsSound, configuration: ConfigurationSound) =
   return zipThemes([commonTheme, specificTheme]);
 };
 
-export const DEFAULT_OPTIONS = {
+export const DEFAULT_OPTIONS: OptionsSound = {
   horizontalSpacing: 10,
   verticalSpacing: 10,
   striped: false,
   highlightOnHover: false,
 };
 
-export const DEFAULT_CONFIGURATION = {
+export const DEFAULT_CONFIGURATION: ConfigurationSound = {
   isVirtualized: false,
 };
 
-export const getTheme = (options?: Options, configuration?: Configuration) => {
+export const getTheme = (options?: Options, configuration?: Configuration): Theme => {
   const mergedOptions = {
     ...DEFAULT_OPTIONS,
     ...(options ? options : {}),

src/themes/material-ui/index.ts renamed to src/material-ui/index.ts

@@ -1,5 +1,7 @@
 import { zipThemes } from '@table-library/react-table-library/theme/index';
 
+import { Theme } from '@table-library/react-table-library/types/theme';
+
 type Configuration = {
   isVirtualized?: boolean;
 };
@@ -153,7 +155,7 @@ export const DEFAULT_CONFIGURATION = {
   isVirtualized: false,
 };
 
-export const getTheme = (options?: Options, configuration?: Configuration) => {
+export const getTheme = (options?: Options, configuration?: Configuration): Theme => {
   const mergedOptions = {
     ...DEFAULT_OPTIONS,
     ...(options ? options : {}),

tsconfig.json

@@ -15,10 +15,10 @@
       "@table-library/react-table-library/tree/*": ["./src/tree/*"],
       "@table-library/react-table-library/pagination/*": ["./src/pagination/*"],
       // themes
-      "@table-library/react-table-library/baseline/*": ["./src/themes/baseline/*"],
-      "@table-library/react-table-library/mantine/*": ["./src/themes/mantine/*"],
-      "@table-library/react-table-library/chakra-ui/*": ["./src/themes/chakra-ui/*"],
-      "@table-library/react-table-library/material-ui/*": ["./src/themes/material-ui/*"],
+      "@table-library/react-table-library/baseline/*": ["./src/baseline/*"],
+      "@table-library/react-table-library/mantine/*": ["./src/mantine/*"],
+      "@table-library/react-table-library/chakra-ui/*": ["./src/chakra-ui/*"],
+      "@table-library/react-table-library/material-ui/*": ["./src/material-ui/*"],
     },
     "allowJs": true,
     "skipLibCheck": true,