@navikt/ds-react 1.3.26 → 1.3.27
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/cjs/button/Button.js
CHANGED
|
@@ -59,7 +59,8 @@ exports.Button = (0, react_1.forwardRef)((_a, ref) => {
|
|
|
59
59
|
};
|
|
60
60
|
}
|
|
61
61
|
}, [loading, children]);
|
|
62
|
-
|
|
62
|
+
const filterProps = (disabled !== null && disabled !== void 0 ? disabled : widthOverride) ? (0, util_1.omit)(rest, ["href"]) : rest;
|
|
63
|
+
return (react_1.default.createElement(Component, Object.assign({}, filterProps, { ref: mergedRef, className: (0, clsx_1.default)(className, "navds-button", `navds-button--${variant}`, `navds-button--${size}`, {
|
|
63
64
|
"navds-button--loading": widthOverride,
|
|
64
65
|
"navds-button--icon-only": !!icon && !children,
|
|
65
66
|
"navds-button--disabled": disabled !== null && disabled !== void 0 ? disabled : widthOverride,
|
package/esm/button/Button.js
CHANGED
|
@@ -12,7 +12,7 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
12
12
|
import React, { useRef, useState, forwardRef, useMemo } from "react";
|
|
13
13
|
import cl from "clsx";
|
|
14
14
|
import { Loader, mergeRefs, Label } from "../";
|
|
15
|
-
import { useClientLayoutEffect } from "../util";
|
|
15
|
+
import { omit, useClientLayoutEffect } from "../util";
|
|
16
16
|
export const Button = forwardRef((_a, ref) => {
|
|
17
17
|
var { as: Component = "button", variant = "primary", className, children, size = "medium", loading = false, disabled, style, icon, iconPosition = "left" } = _a, rest = __rest(_a, ["as", "variant", "className", "children", "size", "loading", "disabled", "style", "icon", "iconPosition"]);
|
|
18
18
|
const buttonRef = useRef(null);
|
|
@@ -30,7 +30,8 @@ export const Button = forwardRef((_a, ref) => {
|
|
|
30
30
|
};
|
|
31
31
|
}
|
|
32
32
|
}, [loading, children]);
|
|
33
|
-
|
|
33
|
+
const filterProps = (disabled !== null && disabled !== void 0 ? disabled : widthOverride) ? omit(rest, ["href"]) : rest;
|
|
34
|
+
return (React.createElement(Component, Object.assign({}, filterProps, { ref: mergedRef, className: cl(className, "navds-button", `navds-button--${variant}`, `navds-button--${size}`, {
|
|
34
35
|
"navds-button--loading": widthOverride,
|
|
35
36
|
"navds-button--icon-only": !!icon && !children,
|
|
36
37
|
"navds-button--disabled": disabled !== null && disabled !== void 0 ? disabled : widthOverride,
|
package/esm/button/Button.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Button.js","sourceRoot":"","sources":["../../src/button/Button.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AACrE,OAAO,EAAE,MAAM,MAAM,CAAC;AACtB,OAAO,EAAwB,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,KAAK,CAAC;AACrE,OAAO,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"Button.js","sourceRoot":"","sources":["../../src/button/Button.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@navikt/ds-react",
|
|
3
|
-
"version": "1.3.
|
|
3
|
+
"version": "1.3.27",
|
|
4
4
|
"description": "NAV designsystem react components",
|
|
5
5
|
"author": "NAV Designsystem team",
|
|
6
6
|
"license": "MIT",
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
},
|
|
37
37
|
"dependencies": {
|
|
38
38
|
"@floating-ui/react-dom-interactions": "0.9.2",
|
|
39
|
-
"@navikt/ds-icons": "^1.3.
|
|
39
|
+
"@navikt/ds-icons": "^1.3.27",
|
|
40
40
|
"@radix-ui/react-tabs": "1.0.0",
|
|
41
41
|
"@radix-ui/react-toggle-group": "1.0.0",
|
|
42
42
|
"clsx": "^1.2.1",
|
|
@@ -75,5 +75,5 @@
|
|
|
75
75
|
"optional": true
|
|
76
76
|
}
|
|
77
77
|
},
|
|
78
|
-
"gitHead": "
|
|
78
|
+
"gitHead": "917abc8b9cfb6343efb6f63537630406e5571cbd"
|
|
79
79
|
}
|
package/src/button/Button.tsx
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import React, { useRef, useState, forwardRef, useMemo } from "react";
|
|
2
2
|
import cl from "clsx";
|
|
3
3
|
import { OverridableComponent, Loader, mergeRefs, Label } from "../";
|
|
4
|
-
import { useClientLayoutEffect } from "../util";
|
|
4
|
+
import { omit, useClientLayoutEffect } from "../util";
|
|
5
5
|
|
|
6
6
|
export interface ButtonProps
|
|
7
7
|
extends React.ButtonHTMLAttributes<HTMLButtonElement> {
|
|
@@ -77,9 +77,12 @@ export const Button: OverridableComponent<ButtonProps, HTMLButtonElement> =
|
|
|
77
77
|
}
|
|
78
78
|
}, [loading, children]);
|
|
79
79
|
|
|
80
|
+
const filterProps =
|
|
81
|
+
disabled ?? widthOverride ? omit(rest, ["href"]) : rest;
|
|
82
|
+
|
|
80
83
|
return (
|
|
81
84
|
<Component
|
|
82
|
-
{...
|
|
85
|
+
{...filterProps}
|
|
83
86
|
ref={mergedRef}
|
|
84
87
|
className={cl(
|
|
85
88
|
className,
|
|
@@ -216,3 +216,29 @@ export const Disabled = () => (
|
|
|
216
216
|
</div>
|
|
217
217
|
</div>
|
|
218
218
|
);
|
|
219
|
+
|
|
220
|
+
export const LoadingWithAs = () => (
|
|
221
|
+
<div className="colgap">
|
|
222
|
+
<div className="rowgap">
|
|
223
|
+
{variants.map((variant) => (
|
|
224
|
+
<Button key={variant} variant={variant} loading size="small">
|
|
225
|
+
{varSwitch[variant]}
|
|
226
|
+
</Button>
|
|
227
|
+
))}
|
|
228
|
+
</div>
|
|
229
|
+
<div className="rowgap">
|
|
230
|
+
{variants.map((variant) => (
|
|
231
|
+
<Button
|
|
232
|
+
key={variant}
|
|
233
|
+
variant={variant}
|
|
234
|
+
loading
|
|
235
|
+
size="small"
|
|
236
|
+
as="a"
|
|
237
|
+
href="#"
|
|
238
|
+
>
|
|
239
|
+
{varSwitch[variant]}
|
|
240
|
+
</Button>
|
|
241
|
+
))}
|
|
242
|
+
</div>
|
|
243
|
+
</div>
|
|
244
|
+
);
|