@darajs/components 1.21.12 → 1.21.13
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.
- package/dist/common/button/button.d.ts +2 -0
- package/dist/common/button/button.d.ts.map +1 -1
- package/dist/common/button/button.js +6 -3
- package/dist/common/button/button.js.map +1 -1
- package/dist/dara_components-1.21.13-py3-none-any.whl +0 -0
- package/dist/umd/dara.components.umd.js +5 -3
- package/package.json +12 -12
- package/dist/dara_components-1.21.12-py3-none-any.whl +0 -0
|
@@ -9,6 +9,8 @@ type ButtonProps = OmitFromMappedType<StyledComponentProps, 'children'> & React.
|
|
|
9
9
|
className: string;
|
|
10
10
|
/** Whether to disable the button */
|
|
11
11
|
disabled: boolean | Condition<any> | Variable<boolean>;
|
|
12
|
+
/** Whether to show a loading spinner */
|
|
13
|
+
loading: boolean | Condition<any> | Variable<boolean>;
|
|
12
14
|
/** Optional Icon to display in the button */
|
|
13
15
|
icon: string;
|
|
14
16
|
/** Action for what happens when the button is clicked */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"button.d.ts","sourceRoot":"","sources":["../../../js/common/button/button.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EACH,KAAK,MAAM,EACX,KAAK,iBAAiB,EACtB,KAAK,SAAS,EAGd,KAAK,oBAAoB,EACzB,KAAK,QAAQ,EAOhB,MAAM,cAAc,CAAC;AAMtB,KAAK,kBAAkB,CAAC,IAAI,EAAE,MAAM,IAAI;KACnC,QAAQ,IAAI,MAAM,IAAI,IAAI,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC;CACxE,CAAC;AAEF,KAAK,WAAW,GAAG,kBAAkB,CAAC,oBAAoB,EAAE,UAAU,CAAC,GACnE,KAAK,CAAC,cAAc,CAAC,iBAAiB,CAAC,GAAG;IACtC,QAAQ,EAAE,KAAK,CAAC,iBAAiB,CAAC,GAAG,MAAM,CAAC;IAC5C,yCAAyC;IACzC,SAAS,EAAE,MAAM,CAAC;IAClB,oCAAoC;IACpC,QAAQ,EAAE,OAAO,GAAG,SAAS,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;IACvD,6CAA6C;IAC7C,IAAI,EAAE,MAAM,CAAC;IACb,yDAAyD;IACzD,OAAO,EAAE,MAAM,CAAC;IAChB,oGAAoG;IACpG,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,mFAAmF;IACnF,sBAAsB,EAAE,OAAO,CAAC;IAChC,6CAA6C;IAC7C,OAAO,EAAE,SAAS,GAAG,WAAW,GAAG,OAAO,GAAG,OAAO,GAAG,OAAO,CAAC;CAClE,CAAC;;
|
|
1
|
+
{"version":3,"file":"button.d.ts","sourceRoot":"","sources":["../../../js/common/button/button.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EACH,KAAK,MAAM,EACX,KAAK,iBAAiB,EACtB,KAAK,SAAS,EAGd,KAAK,oBAAoB,EACzB,KAAK,QAAQ,EAOhB,MAAM,cAAc,CAAC;AAMtB,KAAK,kBAAkB,CAAC,IAAI,EAAE,MAAM,IAAI;KACnC,QAAQ,IAAI,MAAM,IAAI,IAAI,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC;CACxE,CAAC;AAEF,KAAK,WAAW,GAAG,kBAAkB,CAAC,oBAAoB,EAAE,UAAU,CAAC,GACnE,KAAK,CAAC,cAAc,CAAC,iBAAiB,CAAC,GAAG;IACtC,QAAQ,EAAE,KAAK,CAAC,iBAAiB,CAAC,GAAG,MAAM,CAAC;IAC5C,yCAAyC;IACzC,SAAS,EAAE,MAAM,CAAC;IAClB,oCAAoC;IACpC,QAAQ,EAAE,OAAO,GAAG,SAAS,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;IACvD,wCAAwC;IACxC,OAAO,EAAE,OAAO,GAAG,SAAS,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;IACtD,6CAA6C;IAC7C,IAAI,EAAE,MAAM,CAAC;IACb,yDAAyD;IACzD,OAAO,EAAE,MAAM,CAAC;IAChB,oGAAoG;IACpG,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,mFAAmF;IACnF,sBAAsB,EAAE,OAAO,CAAC;IAChC,6CAA6C;IAC7C,OAAO,EAAE,SAAS,GAAG,WAAW,GAAG,OAAO,GAAG,OAAO,GAAG,OAAO,CAAC;CAClE,CAAC;;AA0EN,wBAAwC"}
|
|
@@ -25,15 +25,18 @@ const StyledButton = injectCss(styled(UiButton) `
|
|
|
25
25
|
*/
|
|
26
26
|
function Button(_a, ref) {
|
|
27
27
|
var _b, _c, _d;
|
|
28
|
-
var { children, className, disabled, icon, onclick, outline, styling } = _a, props = __rest(_a, ["children", "className", "disabled", "icon", "onclick", "outline", "styling"]);
|
|
28
|
+
var { children, className, disabled, icon, onclick, outline, styling, loading } = _a, props = __rest(_a, ["children", "className", "disabled", "icon", "onclick", "outline", "styling", "loading"]);
|
|
29
29
|
const [style, css] = useComponentStyles(props); // the styles hook doesn't care about children though here it's wider, includes string
|
|
30
30
|
const onClick = useAction(onclick);
|
|
31
|
-
const
|
|
31
|
+
const actionLoading = useActionIsLoading(onclick);
|
|
32
32
|
const disabledValue = useConditionOrVariable(disabled);
|
|
33
|
+
const propLoading = useConditionOrVariable(loading);
|
|
34
|
+
// default to actionLoading state if user doesn't provide a loading prop, otherwise use the prop
|
|
35
|
+
const loadingValue = loading === null || loading === undefined ? actionLoading : propLoading;
|
|
33
36
|
// Extract icon and grab color from first child if it has it
|
|
34
37
|
const Icon = icon ? getIcon(icon) : null;
|
|
35
38
|
const iconColor = Array.isArray(children) ? ((_c = (_b = children === null || children === void 0 ? void 0 : children[0]) === null || _b === void 0 ? void 0 : _b.props) === null || _c === void 0 ? void 0 : _c.color) || 'inherit' : 'inherit';
|
|
36
|
-
return (_jsxs(StyledButton, Object.assign({ id: props.id_, "$rawCss": css, className: className, disabled: disabledValue, isSimpleButton: typeof children === 'string' || ((_d = children[0]) === null || _d === void 0 ? void 0 : _d.name) === 'Text', loading:
|
|
39
|
+
return (_jsxs(StyledButton, Object.assign({ id: props.id_, "$rawCss": css, className: className, disabled: disabledValue, isSimpleButton: typeof children === 'string' || ((_d = children[0]) === null || _d === void 0 ? void 0 : _d.name) === 'Text', loading: loadingValue, onClick: (e) => {
|
|
37
40
|
if (props.stop_click_propagation !== false) {
|
|
38
41
|
e.stopPropagation();
|
|
39
42
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"button.js","sourceRoot":"","sources":["../../../js/common/button/button.tsx"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAIH,UAAU,EACV,gBAAgB,EAGhB,OAAO,EACP,SAAS,EACT,SAAS,EACT,kBAAkB,EAClB,kBAAkB,EAClB,sBAAsB,GACzB,MAAM,cAAc,CAAC;AACtB,OAAO,MAAM,MAAM,2BAA2B,CAAC;AAC/C,OAAO,EAAE,MAAM,IAAI,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"button.js","sourceRoot":"","sources":["../../../js/common/button/button.tsx"],"names":[],"mappings":"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"}
|
|
Binary file
|
|
@@ -51941,11 +51941,13 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
|
|
|
51941
51941
|
const StyledButton$1 = core$1.injectCss(G(Button$4)`
|
|
51942
51942
|
flex: ${(props) => props.isSimpleButton ? void 0 : "1 1 100%"};
|
|
51943
51943
|
`);
|
|
51944
|
-
function Button({ children: children2, className, disabled: disabled2, icon, onclick, outline, styling, ...props }, ref) {
|
|
51944
|
+
function Button({ children: children2, className, disabled: disabled2, icon, onclick, outline, styling, loading, ...props }, ref) {
|
|
51945
51945
|
const [style2, css2] = core$1.useComponentStyles(props);
|
|
51946
51946
|
const onClick = core$1.useAction(onclick);
|
|
51947
|
-
const
|
|
51947
|
+
const actionLoading = core$1.useActionIsLoading(onclick);
|
|
51948
51948
|
const disabledValue = core$1.useConditionOrVariable(disabled2);
|
|
51949
|
+
const propLoading = core$1.useConditionOrVariable(loading);
|
|
51950
|
+
const loadingValue = loading === null || loading === void 0 ? actionLoading : propLoading;
|
|
51949
51951
|
const Icon2 = icon ? core$1.getIcon(icon) : null;
|
|
51950
51952
|
const iconColor = Array.isArray(children2) ? children2?.[0]?.props?.color || "inherit" : "inherit";
|
|
51951
51953
|
return /* @__PURE__ */ React__namespace.createElement(
|
|
@@ -51956,7 +51958,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
|
|
|
51956
51958
|
className,
|
|
51957
51959
|
disabled: disabledValue,
|
|
51958
51960
|
isSimpleButton: typeof children2 === "string" || children2[0]?.name === "Text",
|
|
51959
|
-
loading,
|
|
51961
|
+
loading: loadingValue,
|
|
51960
51962
|
onClick: (e3) => {
|
|
51961
51963
|
if (props.stop_click_propagation !== false) {
|
|
51962
51964
|
e3.stopPropagation();
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@darajs/components",
|
|
3
|
-
"version": "1.21.
|
|
3
|
+
"version": "1.21.13",
|
|
4
4
|
"description": "Components for the Dara framework",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"module": "dist/index.js",
|
|
@@ -30,9 +30,9 @@
|
|
|
30
30
|
"prettier": "@darajs/prettier-config",
|
|
31
31
|
"devDependencies": {
|
|
32
32
|
"@babel/core": "^7.23.5",
|
|
33
|
-
"@darajs/eslint-config": "1.21.
|
|
34
|
-
"@darajs/prettier-config": "1.21.
|
|
35
|
-
"@darajs/stylelint-config": "1.21.
|
|
33
|
+
"@darajs/eslint-config": "1.21.13",
|
|
34
|
+
"@darajs/prettier-config": "1.21.13",
|
|
35
|
+
"@darajs/stylelint-config": "1.21.13",
|
|
36
36
|
"@testing-library/react-hooks": "^3.4.2",
|
|
37
37
|
"@types/lodash": "^4.14.155",
|
|
38
38
|
"@types/prop-types": "^15.7.15",
|
|
@@ -68,13 +68,13 @@
|
|
|
68
68
|
"@codemirror/state": "^6.0.0",
|
|
69
69
|
"@codemirror/theme-one-dark": "^6.1.2",
|
|
70
70
|
"@codemirror/view": "^6.0.0",
|
|
71
|
-
"@darajs/core": "1.21.
|
|
72
|
-
"@darajs/styled-components": "1.21.
|
|
73
|
-
"@darajs/ui-causal-graph-editor": "1.21.
|
|
74
|
-
"@darajs/ui-components": "1.21.
|
|
75
|
-
"@darajs/ui-hierarchy-viewer": "1.21.
|
|
76
|
-
"@darajs/ui-icons": "1.21.
|
|
77
|
-
"@darajs/ui-utils": "1.21.
|
|
71
|
+
"@darajs/core": "1.21.13",
|
|
72
|
+
"@darajs/styled-components": "1.21.13",
|
|
73
|
+
"@darajs/ui-causal-graph-editor": "1.21.13",
|
|
74
|
+
"@darajs/ui-components": "1.21.13",
|
|
75
|
+
"@darajs/ui-hierarchy-viewer": "1.21.13",
|
|
76
|
+
"@darajs/ui-icons": "1.21.13",
|
|
77
|
+
"@darajs/ui-utils": "1.21.13",
|
|
78
78
|
"@popperjs/core": "2.4.0",
|
|
79
79
|
"@vscode/codicons": "0.0.36",
|
|
80
80
|
"date-fns": "2.30.0",
|
|
@@ -98,5 +98,5 @@
|
|
|
98
98
|
"publishConfig": {
|
|
99
99
|
"access": "public"
|
|
100
100
|
},
|
|
101
|
-
"gitHead": "
|
|
101
|
+
"gitHead": "b814b1449a5faf53e1894c27fa01230882eb24ed"
|
|
102
102
|
}
|
|
Binary file
|