@charcoal-ui/styled 2.6.0 → 3.0.0-beta.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,7 +1,6 @@
1
1
  import { CSSProp, DefaultTheme } from 'styled-components';
2
- import { CharcoalTheme } from '@charcoal-ui/theme';
3
- import { Material } from '@charcoal-ui/foundation';
4
2
  import { ThemeProp } from '.';
3
+ import { MyTheme } from './storyHelper';
5
4
  declare const _default: {
6
5
  title: string;
7
6
  };
@@ -11,12 +10,6 @@ declare module 'react' {
11
10
  css?: CSSProp<DefaultTheme> | ThemeProp<DefaultTheme>;
12
11
  }
13
12
  }
14
- type MyTheme = CharcoalTheme & {
15
- color: {
16
- mycolor: Material;
17
- };
18
- };
19
- export declare function myTheme(theme: CharcoalTheme): MyTheme;
20
13
  declare module 'styled-components' {
21
14
  interface DefaultTheme extends MyTheme {
22
15
  }
@@ -1 +1 @@
1
- {"version":3,"file":"index.story.d.ts","sourceRoot":"","sources":["../src/index.story.tsx"],"names":[],"mappings":"AACA,OAAe,EAAE,OAAO,EAAE,YAAY,EAAiB,MAAM,mBAAmB,CAAA;AAChF,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAClD,OAAO,EAAe,SAAS,EAAwB,MAAM,GAAG,CAAA;;;;AAGhE,wBAEC;AAED,OAAO,QAAQ,OAAO,CAAC;IACrB,UAAU,UAAU;QAClB,GAAG,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,SAAS,CAAC,YAAY,CAAC,CAAA;KACtD;CACF;AAED,KAAK,OAAO,GAAG,aAAa,GAAG;IAC7B,KAAK,EAAE;QACL,OAAO,EAAE,QAAQ,CAAA;KAClB,CAAA;CACF,CAAA;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAQrD;AAED,OAAO,QAAQ,mBAAmB,CAAC;IACjC,UAAiB,YAAa,SAAQ,OAAO;KAAG;CACjD;AAID,eAAO,MAAM,OAAO,mBA8CnB,CAAA;AAED,eAAO,MAAM,YAAY,mBAkBxB,CAAA"}
1
+ {"version":3,"file":"index.story.d.ts","sourceRoot":"","sources":["../src/index.story.tsx"],"names":[],"mappings":"AACA,OAAe,EAAE,OAAO,EAAE,YAAY,EAAiB,MAAM,mBAAmB,CAAA;AAChF,OAAO,EAAe,SAAS,EAAwB,MAAM,GAAG,CAAA;AAEhE,OAAO,EAAE,OAAO,EAAW,MAAM,eAAe,CAAA;;;;AAEhD,wBAEC;AAED,OAAO,QAAQ,OAAO,CAAC;IACrB,UAAU,UAAU;QAClB,GAAG,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,SAAS,CAAC,YAAY,CAAC,CAAA;KACtD;CACF;AAED,OAAO,QAAQ,mBAAmB,CAAC;IACjC,UAAiB,YAAa,SAAQ,OAAO;KAAG;CACjD;AAID,eAAO,MAAM,OAAO,mBA8CnB,CAAA;AAED,eAAO,MAAM,YAAY,mBAkBxB,CAAA"}
@@ -0,0 +1,9 @@
1
+ import { Material } from '@charcoal-ui/foundation';
2
+ import { CharcoalTheme } from '@charcoal-ui/theme';
3
+ export type MyTheme = CharcoalTheme & {
4
+ color: {
5
+ mycolor: Material;
6
+ };
7
+ };
8
+ export declare function myTheme(theme: CharcoalTheme): MyTheme;
9
+ //# sourceMappingURL=storyHelper.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"storyHelper.d.ts","sourceRoot":"","sources":["../src/storyHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAElD,MAAM,MAAM,OAAO,GAAG,aAAa,GAAG;IACpC,KAAK,EAAE;QACL,OAAO,EAAE,QAAQ,CAAA;KAClB,CAAA;CACF,CAAA;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAQrD"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@charcoal-ui/styled",
3
- "version": "2.6.0",
3
+ "version": "3.0.0-beta.0",
4
4
  "license": "Apache-2.0",
5
5
  "main": "./dist/index.cjs.js",
6
6
  "module": "./dist/index.esm.js",
@@ -32,9 +32,9 @@
32
32
  "typescript": "^4.9.5"
33
33
  },
34
34
  "dependencies": {
35
- "@charcoal-ui/foundation": "^2.6.0",
36
- "@charcoal-ui/theme": "^2.6.0",
37
- "@charcoal-ui/utils": "^2.6.0",
35
+ "@charcoal-ui/foundation": "^3.0.0-beta.0",
36
+ "@charcoal-ui/theme": "^3.0.0-beta.0",
37
+ "@charcoal-ui/utils": "^3.0.0-beta.0",
38
38
  "warning": "^4.0.3"
39
39
  },
40
40
  "peerDependencies": {
@@ -53,5 +53,5 @@
53
53
  "url": "https://github.com/pixiv/charcoal.git",
54
54
  "directory": "packages/styled"
55
55
  },
56
- "gitHead": "8579b406b316285a35858512030d2143524ae154"
56
+ "gitHead": "e3522bffb7136b259f31cef88920aebc7637a5b6"
57
57
  }
@@ -1,9 +1,8 @@
1
1
  import React from 'react'
2
2
  import styled, { CSSProp, DefaultTheme, ThemeProvider } from 'styled-components'
3
- import { CharcoalTheme } from '@charcoal-ui/theme'
4
- import { Material } from '@charcoal-ui/foundation'
5
3
  import { createTheme, ThemeProp, defineThemeVariables } from '.'
6
4
  import { disabledSelector } from '@charcoal-ui/utils'
5
+ import { MyTheme, myTheme } from './storyHelper'
7
6
 
8
7
  export default {
9
8
  title: 'styled',
@@ -15,22 +14,6 @@ declare module 'react' {
15
14
  }
16
15
  }
17
16
 
18
- type MyTheme = CharcoalTheme & {
19
- color: {
20
- mycolor: Material
21
- }
22
- }
23
-
24
- export function myTheme(theme: CharcoalTheme): MyTheme {
25
- return {
26
- ...theme,
27
- color: {
28
- ...theme.color,
29
- mycolor: '#ff9e8c',
30
- },
31
- }
32
- }
33
-
34
17
  declare module 'styled-components' {
35
18
  export interface DefaultTheme extends MyTheme {}
36
19
  }
@@ -4,7 +4,8 @@ import 'jest-styled-components'
4
4
  import React from 'react'
5
5
  import renderder from 'react-test-renderer'
6
6
  import { ThemeProvider } from 'styled-components'
7
- import { Example, myTheme, TailwindLike } from './index.story'
7
+ import { Example, TailwindLike } from './index.story'
8
+ import { myTheme } from './storyHelper'
8
9
 
9
10
  function render(children: JSX.Element) {
10
11
  return renderder
@@ -0,0 +1,18 @@
1
+ import { Material } from '@charcoal-ui/foundation'
2
+ import { CharcoalTheme } from '@charcoal-ui/theme'
3
+
4
+ export type MyTheme = CharcoalTheme & {
5
+ color: {
6
+ mycolor: Material
7
+ }
8
+ }
9
+
10
+ export function myTheme(theme: CharcoalTheme): MyTheme {
11
+ return {
12
+ ...theme,
13
+ color: {
14
+ ...theme.color,
15
+ mycolor: '#ff9e8c',
16
+ },
17
+ }
18
+ }