taro-react-uilib 1.0.30 → 1.1.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.
Files changed (38) hide show
  1. package/CHANGELOG.md +41 -6
  2. package/dist/components/Button/index.js +1 -1
  3. package/dist/components/Button/index.js.map +1 -1
  4. package/dist/components/Captcha/index.js +1 -1
  5. package/dist/components/Captcha/index.js.map +1 -1
  6. package/dist/components/DialogRef/index.js +1 -1
  7. package/dist/components/DialogRef/index.js.map +1 -1
  8. package/dist/components/ThemeProvider/index.js +2 -0
  9. package/dist/components/ThemeProvider/index.js.map +1 -0
  10. package/dist/components/src/index.js +1 -1
  11. package/dist/index.js +2 -2
  12. package/dist/index.js.map +1 -1
  13. package/dist/index.umd.js +2 -2
  14. package/dist/index.umd.js.map +1 -1
  15. package/dist/styles/components/button.scss +17 -16
  16. package/dist/styles/components/captcha.scss +1 -1
  17. package/dist/styles/components/dialog.scss +1 -1
  18. package/dist/styles/components/dialogref.scss +9 -5
  19. package/dist/styles/components/index.scss +1 -0
  20. package/dist/styles/components/themeprovider.scss +0 -0
  21. package/dist/styles/themes/default.scss +2 -1
  22. package/dist/styles/themes/variable.scss +2 -2
  23. package/lib/components/Button/index.js +3 -3
  24. package/lib/components/Button/index.js.map +1 -1
  25. package/lib/components/Captcha/index.js +11 -7
  26. package/lib/components/Captcha/index.js.map +1 -1
  27. package/lib/components/DialogRef/index.js +5 -4
  28. package/lib/components/DialogRef/index.js.map +1 -1
  29. package/lib/components/ThemeProvider/index.js +28 -0
  30. package/lib/components/ThemeProvider/index.js.map +1 -0
  31. package/lib/index.js +1 -0
  32. package/lib/index.js.map +1 -1
  33. package/package.json +2 -2
  34. package/types/components/Button/index.d.ts +2 -1
  35. package/types/components/Captcha/index.d.ts +3 -1
  36. package/types/components/Theme/index.d.ts +27 -0
  37. package/types/components/ThemeProvider/index.d.ts +27 -0
  38. package/types/index.d.ts +1 -0
@@ -1,10 +1,12 @@
1
1
  @import "../../styles/themes/variable.scss";
2
- @import "../../styles/themes/default.scss";
3
2
 
4
- button[disabled][type="primary"] {
5
- background-color: #d5d5d5;
3
+ button.xh-button-disabled[disabled][type="primary"] {
4
+ background-color: var(--color-disabled);
6
5
  color: #fff;
7
6
  }
7
+ button.xh-button-primary[type=primary] {
8
+ background-color: var(--btn-color)
9
+ }
8
10
  #{$xh-prefix}-button {
9
11
  position: relative;
10
12
  font-size: $btn-font-size;
@@ -23,9 +25,9 @@ button[disabled][type="primary"] {
23
25
  left: 50%;
24
26
  width: 100%;
25
27
  height: 100%;
26
- background-color: $background-color;
28
+ background-color: var(--background-color);
27
29
  border: inherit;
28
- border-color: $border-color;
30
+ border-color: var(--border-color);
29
31
  border-radius: inherit;
30
32
  transform: translate(-50%, -50%);
31
33
  opacity: 0;
@@ -36,37 +38,36 @@ button[disabled][type="primary"] {
36
38
  }
37
39
 
38
40
  &-default {
39
- color: $font-color;
40
- font-size: $btn-font-size;
41
+ color: var(--font-color);
41
42
  background: #fff;
42
- border: 2px solid $border-color;
43
+ border: 2px solid var(--border-color);
43
44
  }
44
45
 
45
46
  &-primary {
46
47
  color: #fff;
47
- background: $btn-color;
48
- box-shadow: $btn-shadow-primary;
48
+ background: var(--btn-color);
49
+ box-shadow: var(--btn-shadow-primary);
49
50
  }
50
51
 
51
52
  &-secondary {
52
53
  background-color: transparent;
53
- color: $font-color-secondary;
54
- border: 1px solid $font-color-secondary;
54
+ color: var(--font-color-secondary);
55
+ border: 1px solid var(--font-color-secondary);
55
56
  }
56
57
 
57
58
  &-warn {
58
- background-color: $color-warning;
59
+ background-color: var(--color-warning);
59
60
  color: #fff;
60
61
  }
61
62
 
62
63
  &-disabled {
63
- background: #d5d5d5;
64
+ background: var(--color-disabled);
64
65
  color: #fff;
65
66
  box-shadow: unset;
66
67
  }
67
68
 
68
69
  &-square {
69
- border-radius: $border-radius;
70
+ border-radius: var(--border-radius);
70
71
  }
71
72
 
72
73
  &-round {
@@ -102,7 +103,7 @@ button[disabled][type="primary"] {
102
103
  }
103
104
  &[type="default"] {
104
105
  background-color: #fff;
105
- color: $font-color;
106
+ color: var(--font-color);
106
107
  }
107
108
  }
108
109
  }
@@ -5,7 +5,7 @@
5
5
  #{$xh-prefix}-captcha {
6
6
  color: $color-primary;
7
7
  background-color: #fff;
8
- border-color: #666;
8
+ border-color: #333;
9
9
  &:disabled {
10
10
  color: #d5d5d5;
11
11
  }
@@ -63,7 +63,7 @@
63
63
  &-cancel-button {
64
64
  color: #000;
65
65
  margin-right: 40px;
66
- color: #999999;
66
+ color: var(--font-color-tertiary);
67
67
  }
68
68
  }
69
69
  }
@@ -1,6 +1,6 @@
1
1
  @import './mask.scss';
2
2
  @import "../../styles/themes/variable.scss";
3
- @import "../../styles/themes/default.scss";
3
+ // @import "../../styles/themes/default.scss";
4
4
  @import "../../styles/themes/animation.scss";
5
5
 
6
6
  #{$xh-prefix}-dialog-ref {
@@ -49,25 +49,29 @@
49
49
  // margin-top: 60px;
50
50
  .xh-dialog-ref-content-footer-buttons {
51
51
  display: flex;
52
- padding: 0 40px 60px;
52
+ padding: 0 40px 50px;
53
+ &:not(.microApp) {
54
+ height: 100px;
55
+ }
53
56
  &.microApp {
54
57
  border-top: 2px solid #f8f8f8;
55
58
  padding: 0;
56
59
  }
57
60
  &-microapp-cancel {
58
- color: #999999;
61
+ color: var(--font-color-tertiary);
59
62
  border-bottom-left-radius: 10px;
60
63
  border-right: 2px solid #f8f8f8;
61
64
  padding: 10px 0;
62
65
  }
63
66
  &-microapp-confirm {
64
- color: #f6ab00;
67
+ color: var(--color-primary);
65
68
  border-bottom-right-radius: 10px;
66
69
  padding: 10px 0;
67
70
  }
68
71
  &-h5-cancel {
69
72
  margin-right: 40px;
70
- color: #999999;
73
+ color: var(--font-color-tertiary);
74
+ padding: 0;
71
75
  }
72
76
  }
73
77
  }
@@ -20,4 +20,5 @@
20
20
  @import './scrollview.scss';
21
21
  @import './slide.scss';
22
22
  @import './tabbar.scss';
23
+ @import './themeprovider.scss';
23
24
  @import './toast.scss';
File without changes
@@ -1,7 +1,7 @@
1
1
  $color-primary: #f6ab00;
2
2
  $color-primary-dark: #f98f33;
3
3
  $color-primary-reverse: #fff;
4
- $color-disabled: #e6e6e6;
4
+ $color-disabled: #d5d5d5;
5
5
  $color-warning: #ff512d;
6
6
  $color-warning-light: #ff5a66;
7
7
 
@@ -17,6 +17,7 @@ $font-color-tertiary: #999;
17
17
  $border-color: #e6e6e6;
18
18
 
19
19
  $btn-font-size: 34px;
20
+
20
21
  $btn-color: linear-gradient(90deg, $color-primary 0%, $color-primary-dark 100%);
21
22
  $btn-shadow-primary: 0 10px 20px rgba(247, 174, 5, 0.3);
22
23
 
@@ -1,7 +1,7 @@
1
1
  @import "./default.scss";
2
2
 
3
3
  $xh-prefix: ".xh";
4
- :root {
4
+ :root, page {
5
5
  --color-primary: #{$color-primary};
6
6
  --color-primary-dark: #{$color-primary-dark};
7
7
  --color-primary-reverse: #{$color-primary-reverse};
@@ -22,7 +22,7 @@ $xh-prefix: ".xh";
22
22
  }
23
23
 
24
24
  @media (prefers-color-scheme: dark) {
25
- :root {
25
+ :root, page {
26
26
  --color-primary: #{$color-primary};
27
27
  --color-primary-dark: #{$color-primary-dark};
28
28
  --color-primary-reverse: #{$color-primary-reverse};
@@ -4,7 +4,7 @@ import { Button } from "@tarojs/components";
4
4
  import { useTaroEnv } from "../../hooks";
5
5
  import "./index.scss";
6
6
  const XhButton = props => {
7
- const { disabled = false, type = "default", size = "normal", shape = "round", children, className, htmlType, formType, text, openType, lang, sessionFrom, sendMessageTitle, sendMessagePath, sendMessageImg, showMessageCard, appParameter, onGetUserInfo, onGetPhoneNumber, onOpenSetting, onError, onContact, onClick, preventTime = 2500, } = props;
7
+ const { disabled = false, type = "default", size = "normal", shape = "round", children, className, htmlType, formType, text, openType, lang, sessionFrom, sendMessageTitle, sendMessagePath, sendMessageImg, showMessageCard, appParameter, onGetUserInfo, onGetPhoneNumber, onOpenSetting, onError, onContact, onClick, preventTime = 2500, style, } = props;
8
8
  const state = useTaroEnv();
9
9
  const [preventClick, setPreventClick] = useState(false);
10
10
  const timer = useRef();
@@ -46,13 +46,13 @@ const XhButton = props => {
46
46
  clearTimeout(timer.current);
47
47
  };
48
48
  }, []);
49
- const weButton = (React.createElement(Button, { className: classObj, formType: formType, openType: openType, lang: lang, type: type, sessionFrom: sessionFrom, sendMessageTitle: sendMessageTitle, sendMessagePath: sendMessagePath, sendMessageImg: sendMessageImg, showMessageCard: showMessageCard, appParameter: appParameter, onGetUserInfo: onGetUserInfo, onGetPhoneNumber: onGetPhoneNumber, onOpenSetting: onOpenSetting, onError: onError, onContact: onContact, onClick: handleClick, disabled: disabled }, children));
49
+ const weButton = (React.createElement(Button, { className: classObj, formType: formType, openType: openType, lang: lang, type: type, sessionFrom: sessionFrom, sendMessageTitle: sendMessageTitle, sendMessagePath: sendMessagePath, sendMessageImg: sendMessageImg, showMessageCard: showMessageCard, appParameter: appParameter, onGetUserInfo: onGetUserInfo, onGetPhoneNumber: onGetPhoneNumber, onOpenSetting: onOpenSetting, onError: onError, onContact: onContact, onClick: handleClick, disabled: disabled, style: style }, children));
50
50
  if (state === "WEAPP") {
51
51
  return weButton;
52
52
  }
53
53
  return (
54
54
  // eslint-disable-next-line react/button-has-type
55
- React.createElement("button", { className: classObj, disabled: disabled, type: htmlType, onClick: disabled ? undefined : handleClick }, children || text));
55
+ React.createElement("button", { className: classObj, disabled: disabled, type: htmlType, onClick: disabled ? undefined : handleClick, style: style }, children || text));
56
56
  };
57
57
  export default XhButton;
58
58
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Button/index.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Button/index.tsx"],"names":[],"mappings":"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"}
@@ -25,7 +25,9 @@ const CountdownButton = forwardRef((props, fromRef) => {
25
25
  };
26
26
  useImperativeHandle(fromRef, () => ({
27
27
  reset,
28
- }), []);
28
+ begin: counter,
29
+ beginning: disabled,
30
+ }), [disabled]);
29
31
  useEffect(() => {
30
32
  intervalRef.current && clearInterval(intervalRef.current);
31
33
  return () => {
@@ -42,6 +44,7 @@ const CountdownButton = forwardRef((props, fromRef) => {
42
44
  const counter = () => {
43
45
  const now = Date.now();
44
46
  let nowStamp = now;
47
+ setDisabled(true);
45
48
  if (intervalRef.current) {
46
49
  clearInterval(intervalRef.current);
47
50
  }
@@ -59,14 +62,15 @@ const CountdownButton = forwardRef((props, fromRef) => {
59
62
  }, 1000);
60
63
  };
61
64
  const handleClick = () => {
62
- setDisabled(true);
63
65
  const promise = onClick();
64
- promise.then(counter).catch(() => {
65
- console.log("callback reject....");
66
- setDisabled(false);
67
- });
66
+ if (promise && promise.then) {
67
+ promise.then(counter).catch(() => {
68
+ console.log("callback reject....");
69
+ setDisabled(false);
70
+ });
71
+ }
68
72
  };
69
- return (React.createElement(Button, Object.assign({}, props, { className: classnames("xh-captcha", className), disabled: disabled, onClick: handleClick, type: "secondary", shape: "square", size: "mini" }, rest, { ref: fromRef }), buttonText));
73
+ return (React.createElement(Button, Object.assign({}, props, { className: classnames("xh-captcha", className), disabled: disabled, onClick: handleClick, type: "secondary", shape: "square", size: "mini" }, rest), buttonText));
70
74
  });
71
75
  export default CountdownButton;
72
76
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Captcha/index.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Captcha/index.tsx"],"names":[],"mappings":"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"}
@@ -39,13 +39,14 @@ const DialogCom = forwardRef((props, fromRef) => {
39
39
  const footercls = classNames("xh-dialog-ref-content-footer-buttons", {
40
40
  microApp: process.env.TARO_ENV !== "h5",
41
41
  });
42
+ const morcoBtnProps = process.env.TARO_ENV !== "h5" ? { type: "ghost", shape: "rectangle" } : {};
42
43
  const dialogFooter = (React.createElement(View, { className: footercls },
43
- showCancel && (React.createElement(Button, { preventTime: 0, onClick: handleCancel, className: process.env.TARO_ENV !== "h5"
44
+ showCancel && (React.createElement(Button, Object.assign({}, morcoBtnProps, { preventTime: 0, onClick: handleCancel, className: process.env.TARO_ENV !== "h5"
44
45
  ? "xh-dialog-ref-content-footer-buttons-microapp-cancel"
45
- : "xh-dialog-ref-content-footer-buttons-h5-cancel" }, cancelText)),
46
- React.createElement(Button, { type: "primary", className: process.env.TARO_ENV !== "h5"
46
+ : "xh-dialog-ref-content-footer-buttons-h5-cancel" }), cancelText)),
47
+ React.createElement(Button, Object.assign({ type: "primary" }, morcoBtnProps, { className: process.env.TARO_ENV !== "h5"
47
48
  ? "xh-dialog-ref-content-footer-buttons-microapp-confirm"
48
- : "xh-dialog-ref-content-footer-buttons-h5-confirm", onClick: handleConfirm, preventTime: 0 }, confirmText)));
49
+ : "xh-dialog-ref-content-footer-buttons-h5-confirm", onClick: handleConfirm, preventTime: 0 }), confirmText)));
49
50
  const DialogMain = (React.createElement(View, { className: dialogcls },
50
51
  React.createElement(Mask, null),
51
52
  React.createElement(CSSTransition, { in: selfVisible, timeout: 200, classNames: "scale" },
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/DialogRef/index.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/DialogRef/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAEZ,QAAQ,EACR,mBAAmB,EACnB,UAAU,EACV,SAAS,GACV,MAAM,OAAO,CAAC;AACf,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,MAAyB,MAAM,WAAW,CAAC;AAElD,OAAO,IAAI,MAAM,SAAS,CAAC;AAC3B,OAAO,cAAc,CAAC;AAmBtB,MAAM,SAAS,GAAG,UAAU,CAA0B,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;IACvE,MAAM,EACJ,MAAM,EACN,OAAO,EACP,SAAS,GAAG,EAAE,EACd,OAAO,EACP,UAAU,GAAG,IAAI,EACjB,WAAW,GAAG,IAAI,EAClB,UAAU,GAAG,IAAI,EACjB,MAAM,GAAG,KAAK,EACd,SAAS,EACT,QAAQ,EACR,OAAO,GACR,GAAG,KAAK,CAAC;IACV,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAEtD,mBAAmB,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;QAClC,KAAK;QACL,IAAI;KACL,CAAC,CAAC,CAAC;IAEJ,MAAM,KAAK,GAAG,GAAG,EAAE;QACjB,OAAO,IAAI,OAAO,EAAE,CAAC;QACrB,cAAc,CAAC,KAAK,CAAC,CAAC;IACxB,CAAC,CAAC;IAEF,MAAM,IAAI,GAAG,GAAG,EAAE;QAChB,cAAc,CAAC,IAAI,CAAC,CAAC;IACvB,CAAC,CAAC;IAEF,MAAM,aAAa,GAAG,GAAG,EAAE;QACzB,SAAS,IAAI,SAAS,EAAE,CAAC;QACzB,WAAW;IACb,CAAC,CAAC;IACF,MAAM,YAAY,GAAG,GAAG,EAAE;QACxB,QAAQ,IAAI,QAAQ,EAAE,CAAC;QACvB,KAAK,EAAE,CAAC;IACV,CAAC,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO,IAAI,OAAO,EAAE,CAAC;SACtB;QACD,cAAc,CAAC,OAAO,CAAC,CAAC;IAC1B,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IAEd,MAAM,SAAS,GAAG,UAAU,CAAC,eAAe,EAAE,SAAS,EAAE;QACvD,IAAI,EAAE,WAAW;KAClB,CAAC,CAAC;IACH,MAAM,SAAS,GAAG,UAAU,CAAC,sCAAsC,EAAE;QACnE,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,IAAI;KACxC,CAAC,CAAC;IAEH,MAAM,aAAa,GAGjB,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAE7E,MAAM,YAAY,GAAG,CACnB,oBAAC,IAAI,IAAC,SAAS,EAAE,SAAS;QACvB,UAAU,IAAI,CACb,oBAAC,MAAM,oBACD,aAAa,IACjB,WAAW,EAAE,CAAC,EACd,OAAO,EAAE,YAAY,EACrB,SAAS,EACP,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,IAAI;gBAC3B,CAAC,CAAC,sDAAsD;gBACxD,CAAC,CAAC,gDAAgD,KAGrD,UAAU,CACJ,CACV;QACD,oBAAC,MAAM,kBACL,IAAI,EAAC,SAAS,IACV,aAAa,IACjB,SAAS,EACP,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,IAAI;gBAC3B,CAAC,CAAC,uDAAuD;gBACzD,CAAC,CAAC,iDAAiD,EAEvD,OAAO,EAAE,aAAa,EACtB,WAAW,EAAE,CAAC,KAEb,WAAW,CACL,CACJ,CACR,CAAC;IAEF,MAAM,UAAU,GAAG,CACjB,oBAAC,IAAI,IAAC,SAAS,EAAE,SAAS;QACxB,oBAAC,IAAI,OAAG;QACR,oBAAC,aAAa,IAAC,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,EAAE,UAAU,EAAC,OAAO;YAC9D,oBAAC,IAAI,IAAC,SAAS,EAAC,uBAAuB;gBACrC,oBAAC,IAAI,IAAC,SAAS,EAAC,8BAA8B,IAAE,MAAM,CAAQ;gBAC9D,oBAAC,IAAI,IAAC,SAAS,EAAC,+BAA+B,IAAE,OAAO,CAAQ;gBAC/D,MAAM,IAAI,CACT,oBAAC,IAAI,IAAC,SAAS,EAAC,8BAA8B,IAAE,YAAY,CAAQ,CACrE,CACI,CACO,CACX,CACR,CAAC;IACF,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC,CAAC;AAEH,eAAe,SAAS,CAAC"}
@@ -0,0 +1,28 @@
1
+ import React, { createContext } from "react";
2
+ const createTheme = (theme) => {
3
+ return createContext(Object.assign({}, theme));
4
+ };
5
+ export const ThemeContext = createTheme({});
6
+ const ThemeProvider = ({ children, value, scoped = false, }) => {
7
+ let clonedElement = children;
8
+ if (!scoped) {
9
+ Object.keys(value).forEach(key => {
10
+ document.body.style.setProperty(key, value[key]);
11
+ });
12
+ }
13
+ else {
14
+ clonedElement = React.Children.map(children, (child, index) => {
15
+ if (index === 0) {
16
+ return React.cloneElement(child, {
17
+ style: value,
18
+ });
19
+ }
20
+ else {
21
+ return child;
22
+ }
23
+ });
24
+ }
25
+ return (React.createElement(ThemeContext.Provider, { value: value }, clonedElement));
26
+ };
27
+ export default ThemeProvider;
28
+ //# sourceMappingURL=index.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/ThemeProvider/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAyB7C,MAAM,WAAW,GAAG,CAAC,KAAgC,EAAE,EAAE;IACvD,OAAO,aAAa,mBAAM,KAAK,EAAG,CAAC;AACrC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,WAAW,CAAC,EAAE,CAAC,CAAC;AAE5C,MAAM,aAAa,GAAiC,CAAC,EACnD,QAAQ,EACR,KAAK,EACL,MAAM,GAAG,KAAK,GACf,EAAE,EAAE;IACH,IAAI,aAAa,GAAG,QAAQ,CAAC;IAC7B,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC/B,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;QACnD,CAAC,CAAC,CAAC;KACJ;SAAM;QACL,aAAa,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;YAC5D,IAAI,KAAK,KAAK,CAAC,EAAE;gBACf,OAAO,KAAK,CAAC,YAAY,CAAC,KAAY,EAAE;oBACtC,KAAK,EAAE,KAAK;iBACb,CAAC,CAAC;aACJ;iBAAM;gBACL,OAAO,KAAK,CAAC;aACd;QACH,CAAC,CAAC,CAAC;KACJ;IAED,OAAO,CACL,oBAAC,YAAY,CAAC,QAAQ,IAAC,KAAK,EAAE,KAAK,IAAG,aAAa,CAAyB,CAC7E,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,aAAa,CAAC"}
package/lib/index.js CHANGED
@@ -16,4 +16,5 @@ export { default as XHDialogRef } from "./components/DialogRef";
16
16
  export { default as XHTabbar } from "./components/Tabbar";
17
17
  export { default as XHPopup } from "./components/Popup";
18
18
  export { default as XHPicker } from "./components/Picker";
19
+ export { default as ThemeProvider } from "./components/ThemeProvider";
19
20
  //# sourceMappingURL=index.js.map
package/lib/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC1E,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,4BAA4B,CAAC;AACxE,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,qBAAqB,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC1E,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,4BAA4B,CAAC;AACxE,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,4BAA4B,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "taro-react-uilib",
3
- "version": "1.0.30",
3
+ "version": "1.1.0",
4
4
  "description": "基于taro的跨端组件库",
5
5
  "templateInfo": {
6
6
  "name": "default",
@@ -37,7 +37,7 @@
37
37
  "test:ci": "yarn run build:h5 && yarn run test",
38
38
  "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0 && git add CHANGELOG.md",
39
39
  "clean": "rimraf .temp dist lib coverage",
40
- "version": "yarn run build && git add lib && yarn run changelog",
40
+ "version": "yarn run changelog",
41
41
  "prepare": "husky install"
42
42
  },
43
43
  "husky": {
@@ -1,4 +1,4 @@
1
- import { FC } from "react";
1
+ import React, { FC } from "react";
2
2
  import { ButtonProps } from "@tarojs/components/types/Button";
3
3
  import { ITouchEvent } from "@tarojs/components/types/common";
4
4
  import "./index.scss";
@@ -37,6 +37,7 @@ export declare type XhButtonProps = {
37
37
  text?: string;
38
38
  preventTime?: number;
39
39
  onClick?: (e: ITouchEvent | MouseEvent) => void;
40
+ style?: React.CSSProperties;
40
41
  } & Omit<ButtonProps, "type" | "size">;
41
42
  declare const XhButton: FC<XhButtonProps>;
42
43
  export default XhButton;
@@ -1,8 +1,10 @@
1
1
  import React, { Ref } from "react";
2
2
  import { XhButtonProps } from "../Button";
3
3
  import "./index.scss";
4
- declare type refMe = {
4
+ export declare type refMe = {
5
5
  reset: () => void;
6
+ begin: () => void;
7
+ beginning: boolean;
6
8
  };
7
9
  export interface CaptchaProps extends XhButtonProps {
8
10
  timeout?: number;
@@ -0,0 +1,27 @@
1
+ import React from "react";
2
+ export declare type ThemeValue = {
3
+ "--color-primary"?: string;
4
+ "--color-primary-dark"?: string;
5
+ "--color-primary-reverse"?: string;
6
+ "--color-disabled"?: string;
7
+ "--color-warning"?: string;
8
+ "--color-warning-light"?: string;
9
+ "--background-color"?: string;
10
+ "--body-background-color"?: string;
11
+ "--font-color"?: string;
12
+ "--font-color-secondary"?: string;
13
+ "--font-color-tertiary"?: string;
14
+ "--border-color"?: string;
15
+ "--btn-color"?: string;
16
+ "--btn-shadow-primary"?: string;
17
+ "--mask-color"?: string;
18
+ };
19
+ export declare type ThemeProviderProps = {
20
+ value: ThemeValue;
21
+ scoped?: boolean;
22
+ };
23
+ export declare const ThemeContext: React.Context<{
24
+ [x: string]: string;
25
+ }>;
26
+ declare const ThemeProvider: React.FC<ThemeProviderProps>;
27
+ export default ThemeProvider;
@@ -0,0 +1,27 @@
1
+ import React from "react";
2
+ export declare type ThemeValue = {
3
+ "--color-primary"?: string;
4
+ "--color-primary-dark"?: string;
5
+ "--color-primary-reverse"?: string;
6
+ "--color-disabled"?: string;
7
+ "--color-warning"?: string;
8
+ "--color-warning-light"?: string;
9
+ "--background-color"?: string;
10
+ "--body-background-color"?: string;
11
+ "--font-color"?: string;
12
+ "--font-color-secondary"?: string;
13
+ "--font-color-tertiary"?: string;
14
+ "--border-color"?: string;
15
+ "--btn-color"?: string;
16
+ "--btn-shadow-primary"?: string;
17
+ "--mask-color"?: string;
18
+ };
19
+ export declare type ThemeProviderProps = {
20
+ value: ThemeValue;
21
+ scoped?: boolean;
22
+ };
23
+ export declare const ThemeContext: React.Context<{
24
+ [x: string]: string;
25
+ }>;
26
+ declare const ThemeProvider: React.FC<ThemeProviderProps>;
27
+ export default ThemeProvider;
package/types/index.d.ts CHANGED
@@ -16,3 +16,4 @@ export { default as XHDialogRef } from "./components/DialogRef";
16
16
  export { default as XHTabbar } from "./components/Tabbar";
17
17
  export { default as XHPopup } from "./components/Popup";
18
18
  export { default as XHPicker } from "./components/Picker";
19
+ export { default as ThemeProvider } from "./components/ThemeProvider";