@navikt/ds-react 0.14.10-next.0 → 0.14.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/cjs/button/Button.js +22 -3
- package/cjs/form/Fieldset/Fieldset.js +3 -3
- package/cjs/form/Select.js +2 -2
- package/cjs/form/Switch.js +1 -1
- package/cjs/form/TextField.js +5 -3
- package/cjs/form/Textarea.js +3 -3
- package/cjs/form/checkbox/Checkbox.js +1 -1
- package/cjs/form/search-field/SearchField.js +21 -42
- package/cjs/form/search-field/SearchFieldButton.js +50 -0
- package/cjs/form/search-field/SearchFieldClearButton.js +50 -0
- package/cjs/form/search-field/SearchFieldInput.js +49 -0
- package/cjs/modal/Modal.js +4 -4
- package/cjs/util/index.js +1 -15
- package/esm/button/Button.d.ts +5 -0
- package/esm/button/Button.js +24 -5
- package/esm/button/Button.js.map +1 -1
- package/esm/form/Fieldset/Fieldset.js +3 -3
- package/esm/form/Fieldset/Fieldset.js.map +1 -1
- package/esm/form/Select.js +2 -2
- package/esm/form/Select.js.map +1 -1
- package/esm/form/Switch.js +1 -1
- package/esm/form/Switch.js.map +1 -1
- package/esm/form/TextField.js +5 -3
- package/esm/form/TextField.js.map +1 -1
- package/esm/form/Textarea.js +3 -3
- package/esm/form/Textarea.js.map +1 -1
- package/esm/form/checkbox/Checkbox.js +1 -1
- package/esm/form/checkbox/Checkbox.js.map +1 -1
- package/esm/form/search-field/SearchField.d.ts +25 -25
- package/esm/form/search-field/SearchField.js +22 -44
- package/esm/form/search-field/SearchField.js.map +1 -1
- package/esm/form/search-field/SearchFieldButton.d.ts +17 -0
- package/esm/form/search-field/SearchFieldButton.js +27 -0
- package/esm/form/search-field/SearchFieldButton.js.map +1 -0
- package/esm/form/search-field/SearchFieldClearButton.d.ts +17 -0
- package/esm/form/search-field/SearchFieldClearButton.js +27 -0
- package/esm/form/search-field/SearchFieldClearButton.js.map +1 -0
- package/esm/form/search-field/SearchFieldInput.d.ts +6 -0
- package/esm/form/search-field/SearchFieldInput.js +26 -0
- package/esm/form/search-field/SearchFieldInput.js.map +1 -0
- package/esm/modal/Modal.d.ts +5 -0
- package/esm/modal/Modal.js +4 -4
- package/esm/modal/Modal.js.map +1 -1
- package/esm/util/index.d.ts +0 -5
- package/esm/util/index.js +0 -13
- package/esm/util/index.js.map +1 -1
- package/package.json +3 -3
- package/src/button/Button.tsx +55 -18
- package/src/button/stories/button.stories.mdx +17 -11
- package/src/button/stories/button.stories.tsx +41 -3
- package/src/form/Fieldset/Fieldset.tsx +3 -3
- package/src/form/Select.tsx +2 -2
- package/src/form/Switch.tsx +1 -1
- package/src/form/TextField.tsx +5 -3
- package/src/form/Textarea.tsx +3 -3
- package/src/form/checkbox/Checkbox.tsx +1 -1
- package/src/form/search-field/SearchField.tsx +69 -124
- package/src/form/search-field/SearchFieldButton.tsx +47 -0
- package/src/form/search-field/SearchFieldClearButton.tsx +49 -0
- package/src/form/search-field/SearchFieldInput.tsx +42 -0
- package/src/form/search-field/stories/search-field-example.tsx +25 -0
- package/src/form/search-field/stories/search-field.stories.mdx +89 -158
- package/src/form/search-field/stories/search-field.stories.tsx +154 -62
- package/src/loader/stories/loader.stories.mdx +0 -22
- package/src/modal/Modal.tsx +19 -12
- package/src/modal/stories/modal.stories.tsx +16 -0
- package/src/util/index.ts +0 -33
- package/cjs/form/search-field/useSearchField.js +0 -31
- package/esm/form/search-field/useSearchField.d.ts +0 -10
- package/esm/form/search-field/useSearchField.js +0 -25
- package/esm/form/search-field/useSearchField.js.map +0 -1
- package/src/form/search-field/useSearchField.ts +0 -31
package/esm/form/Textarea.js
CHANGED
|
@@ -26,10 +26,10 @@ const Textarea = forwardRef((props, ref) => {
|
|
|
26
26
|
"navds-textarea--disabled": !!inputProps.disabled,
|
|
27
27
|
}) },
|
|
28
28
|
React.createElement(Label, { htmlFor: inputProps.id, size: size, as: "label", className: cl("navds-textarea__label", {
|
|
29
|
-
"sr-only": hideLabel,
|
|
29
|
+
"navds-sr-only": hideLabel,
|
|
30
30
|
}) }, label),
|
|
31
31
|
!!description && (React.createElement(BodyShort, { as: "div", className: cl("navds-textarea__description", {
|
|
32
|
-
"sr-only": hideLabel,
|
|
32
|
+
"navds-sr-only": hideLabel,
|
|
33
33
|
}), id: inputDescriptionId, size: size }, description)),
|
|
34
34
|
React.createElement("div", { className: "navds-textarea__wrapper" },
|
|
35
35
|
React.createElement(TextareaAutosize, Object.assign({}, omit(rest, ["error", "errorId", "size"]), inputProps, { ref: ref, className: cl("navds-textarea__input", "navds-body-short", `navds-body-${size !== null && size !== void 0 ? size : "medium"}`, {
|
|
@@ -38,7 +38,7 @@ const Textarea = forwardRef((props, ref) => {
|
|
|
38
38
|
[maxLengthId]: hasMaxLength,
|
|
39
39
|
}) })),
|
|
40
40
|
hasMaxLength && (React.createElement(React.Fragment, null,
|
|
41
|
-
React.createElement("span", { id: maxLengthId, className: "sr-only" },
|
|
41
|
+
React.createElement("span", { id: maxLengthId, className: "navds-sr-only" },
|
|
42
42
|
"Tekstomr\u00E5de med plass til ",
|
|
43
43
|
maxLength,
|
|
44
44
|
" tegn., Textarea can have",
|
package/esm/form/Textarea.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Textarea.js","sourceRoot":"","sources":["../../src/form/Textarea.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAC1C,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,gBAAgB,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AAC5C,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAkB,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9D,OAAO,EAAE,KAAK,EAAE,MAAM,IAAI,CAAC;AAiC3B,MAAM,QAAQ,GAAG,UAAU,CACzB,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;IACb,MAAM,EACJ,UAAU,EACV,OAAO,EACP,YAAY,EACZ,QAAQ,EACR,IAAI,EACJ,kBAAkB,GACnB,GAAG,YAAY,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;IAEpC,MAAM,EACJ,KAAK,EACL,SAAS,EACT,WAAW,EACX,SAAS,EACT,SAAS,GAAG,KAAK,KAEf,KAAK,EADJ,IAAI,UACL,KAAK,EAPH,+DAOL,CAAQ,CAAC;IAEV,MAAM,WAAW,GAAG,qBAAqB,KAAK,EAAE,EAAE,CAAC;IACnD,MAAM,YAAY,GAAG,SAAS,KAAK,SAAS,IAAI,SAAS,GAAG,CAAC,CAAC;IAE9D,OAAO,CACL,6BACE,SAAS,EAAE,EAAE,CACX,SAAS,EACT,kBAAkB,EAClB,qBAAqB,IAAI,EAAE,EAC3B;YACE,uBAAuB,EAAE,QAAQ;YACjC,0BAA0B,EAAE,CAAC,CAAC,UAAU,CAAC,QAAQ;SAClD,CACF;QAED,oBAAC,KAAK,IACJ,OAAO,EAAE,UAAU,CAAC,EAAE,EACtB,IAAI,EAAE,IAAI,EACV,EAAE,EAAC,OAAO,EACV,SAAS,EAAE,EAAE,CAAC,uBAAuB,EAAE;gBACrC,
|
|
1
|
+
{"version":3,"file":"Textarea.js","sourceRoot":"","sources":["../../src/form/Textarea.tsx"],"names":[],"mappings":"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"}
|
|
@@ -18,7 +18,7 @@ const Checkbox = forwardRef((props, ref) => {
|
|
|
18
18
|
]), inputProps, { className: "navds-checkbox__input", ref: ref })),
|
|
19
19
|
React.createElement("label", { htmlFor: inputProps.id, className: "navds-checkbox__label" },
|
|
20
20
|
React.createElement("div", { className: cl("navds-checkbox__content", {
|
|
21
|
-
"sr-only": props.hideLabel,
|
|
21
|
+
"navds-sr-only": props.hideLabel,
|
|
22
22
|
}) },
|
|
23
23
|
React.createElement(BodyShort, { as: "div", size: size }, props.children),
|
|
24
24
|
props.description && (React.createElement(Description, { as: "div", size: "small", className: "navds-checkbox__description" }, props.description))))));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Checkbox.js","sourceRoot":"","sources":["../../../src/form/checkbox/Checkbox.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAuB,MAAM,OAAO,CAAC;AAC/D,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,WAAW,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AAwBhD,MAAM,QAAQ,GAAG,UAAU,CAAkC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;IAC1E,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;IAE1D,MAAM,WAAW,GAAG,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC;IAE3D,OAAO,CACL,6BACE,SAAS,EAAE,EAAE,CACX,KAAK,CAAC,SAAS,EACf,gBAAgB,EAChB,mBAAmB,IAAI,EAAE,EACzB;YACE,uBAAuB,EAAE,QAAQ;YACjC,0BAA0B,EAAE,UAAU,CAAC,QAAQ;SAChD,CACF;QAED,+CACM,IAAI,CAAC,KAAK,EAAE;YACd,UAAU;YACV,MAAM;YACN,OAAO;YACP,aAAa;YACb,WAAW;SACZ,CAAC,EACE,UAAU,IACd,SAAS,EAAC,uBAAuB,EACjC,GAAG,EAAE,GAAG,IACR;QACF,+BAAO,OAAO,EAAE,UAAU,CAAC,EAAE,EAAE,SAAS,EAAC,uBAAuB;YAC9D,6BACE,SAAS,EAAE,EAAE,CAAC,yBAAyB,EAAE;oBACvC,
|
|
1
|
+
{"version":3,"file":"Checkbox.js","sourceRoot":"","sources":["../../../src/form/checkbox/Checkbox.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAuB,MAAM,OAAO,CAAC;AAC/D,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,WAAW,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AAwBhD,MAAM,QAAQ,GAAG,UAAU,CAAkC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;IAC1E,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;IAE1D,MAAM,WAAW,GAAG,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC;IAE3D,OAAO,CACL,6BACE,SAAS,EAAE,EAAE,CACX,KAAK,CAAC,SAAS,EACf,gBAAgB,EAChB,mBAAmB,IAAI,EAAE,EACzB;YACE,uBAAuB,EAAE,QAAQ;YACjC,0BAA0B,EAAE,UAAU,CAAC,QAAQ;SAChD,CACF;QAED,+CACM,IAAI,CAAC,KAAK,EAAE;YACd,UAAU;YACV,MAAM;YACN,OAAO;YACP,aAAa;YACb,WAAW;SACZ,CAAC,EACE,UAAU,IACd,SAAS,EAAC,uBAAuB,EACjC,GAAG,EAAE,GAAG,IACR;QACF,+BAAO,OAAO,EAAE,UAAU,CAAC,EAAE,EAAE,SAAS,EAAC,uBAAuB;YAC9D,6BACE,SAAS,EAAE,EAAE,CAAC,yBAAyB,EAAE;oBACvC,eAAe,EAAE,KAAK,CAAC,SAAS;iBACjC,CAAC;gBAEF,oBAAC,SAAS,IAAC,EAAE,EAAC,KAAK,EAAC,IAAI,EAAE,IAAI,IAC3B,KAAK,CAAC,QAAQ,CACL;gBACX,KAAK,CAAC,WAAW,IAAI,CACpB,oBAAC,WAAW,IACV,EAAE,EAAC,KAAK,EACR,IAAI,EAAC,OAAO,EACZ,SAAS,EAAC,6BAA6B,IAEtC,KAAK,CAAC,WAAW,CACN,CACf,CACG,CACA,CACJ,CACP,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,eAAe,QAAQ,CAAC"}
|
|
@@ -1,6 +1,23 @@
|
|
|
1
|
-
import React
|
|
1
|
+
import React from "react";
|
|
2
2
|
import { FormFieldProps } from "../useFormField";
|
|
3
|
-
|
|
3
|
+
import { SearchFieldButtonType } from "./SearchFieldButton";
|
|
4
|
+
import { SearchFieldClearButtonType } from "./SearchFieldClearButton";
|
|
5
|
+
import { SearchFieldInputType } from "./SearchFieldInput";
|
|
6
|
+
export interface SearchFieldContextProps {
|
|
7
|
+
inputProps: {
|
|
8
|
+
id: string;
|
|
9
|
+
"aria-invalid": boolean;
|
|
10
|
+
"aria-describedby"?: string;
|
|
11
|
+
disabled?: boolean;
|
|
12
|
+
};
|
|
13
|
+
size?: "medium" | "small";
|
|
14
|
+
}
|
|
15
|
+
export declare const SearchFieldContext: React.Context<SearchFieldContextProps | null>;
|
|
16
|
+
export interface SearchFieldProps extends FormFieldProps, React.HTMLAttributes<HTMLDivElement> {
|
|
17
|
+
/**
|
|
18
|
+
* SearchFieldInput & SearchFieldButton
|
|
19
|
+
*/
|
|
20
|
+
children: React.ReactNode;
|
|
4
21
|
/**
|
|
5
22
|
* If enabled shows the label and description for screenreaders only
|
|
6
23
|
*/
|
|
@@ -9,28 +26,11 @@ export interface SearchFieldProps extends Omit<FormFieldProps, "error" | "errorI
|
|
|
9
26
|
* SearchField label
|
|
10
27
|
*/
|
|
11
28
|
label: React.ReactNode;
|
|
12
|
-
/**
|
|
13
|
-
* Inverts color theme
|
|
14
|
-
* @default false
|
|
15
|
-
*/
|
|
16
|
-
inverted?: boolean;
|
|
17
|
-
/**
|
|
18
|
-
* Customize aria-label on clear button
|
|
19
|
-
* @default "Slett tekst i felt"
|
|
20
|
-
*/
|
|
21
|
-
clearButtonLabel?: string;
|
|
22
|
-
/**
|
|
23
|
-
* Callback for when user manually clears input with button or Escape
|
|
24
|
-
*/
|
|
25
|
-
onClear?: () => void;
|
|
26
|
-
/**
|
|
27
|
-
* Callback for value in input after change
|
|
28
|
-
*/
|
|
29
|
-
onChange?: (value: string) => void;
|
|
30
|
-
/**
|
|
31
|
-
* Toggles display of "clear"-button when there is text in field
|
|
32
|
-
*/
|
|
33
|
-
clearButton?: boolean;
|
|
34
29
|
}
|
|
35
|
-
|
|
30
|
+
interface SearchFieldComponent extends React.ForwardRefExoticComponent<SearchFieldProps & React.RefAttributes<HTMLDivElement>> {
|
|
31
|
+
Button: SearchFieldButtonType;
|
|
32
|
+
Clear: SearchFieldClearButtonType;
|
|
33
|
+
Input: SearchFieldInputType;
|
|
34
|
+
}
|
|
35
|
+
declare const SearchField: SearchFieldComponent;
|
|
36
36
|
export default SearchField;
|
|
@@ -9,59 +9,37 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
9
9
|
}
|
|
10
10
|
return t;
|
|
11
11
|
};
|
|
12
|
-
import { Close, Search } from "@navikt/ds-icons";
|
|
13
12
|
import cl from "classnames";
|
|
14
|
-
import React, { forwardRef
|
|
15
|
-
import
|
|
16
|
-
import
|
|
17
|
-
import {
|
|
13
|
+
import React, { forwardRef } from "react";
|
|
14
|
+
import { BodyShort, Label, omit } from "../..";
|
|
15
|
+
import ErrorMessage from "../ErrorMessage";
|
|
16
|
+
import { useFormField } from "../useFormField";
|
|
17
|
+
import SearchFieldButton from "./SearchFieldButton";
|
|
18
|
+
import SearchFieldClearButton from "./SearchFieldClearButton";
|
|
19
|
+
import SearchFieldInput from "./SearchFieldInput";
|
|
20
|
+
export const SearchFieldContext = React.createContext(null);
|
|
18
21
|
const SearchField = forwardRef((props, ref) => {
|
|
19
|
-
const { inputProps, size, inputDescriptionId } =
|
|
20
|
-
const { className, hideLabel, label, description,
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
const mergedRef = mergeRefs([searchRef, ref]);
|
|
24
|
-
const [wrapperRef, setWrapperRef] = useState(null);
|
|
25
|
-
const handleChange = useCallback((v) => {
|
|
26
|
-
var _a;
|
|
27
|
-
if (searchRef.current && value === undefined) {
|
|
28
|
-
searchRef.current.value = v;
|
|
29
|
-
setControlledValue(v);
|
|
30
|
-
}
|
|
31
|
-
(_a = props === null || props === void 0 ? void 0 : props.onChange) === null || _a === void 0 ? void 0 : _a.call(props, v);
|
|
32
|
-
}, [props, value]);
|
|
33
|
-
const handleClear = useCallback(() => {
|
|
34
|
-
var _a, _b;
|
|
35
|
-
onClear === null || onClear === void 0 ? void 0 : onClear();
|
|
36
|
-
handleChange("");
|
|
37
|
-
searchRef.current && ((_b = (_a = searchRef.current) === null || _a === void 0 ? void 0 : _a.focus) === null || _b === void 0 ? void 0 : _b.call(_a));
|
|
38
|
-
}, [handleChange, onClear]);
|
|
39
|
-
useEventListener("keydown", useCallback((e) => {
|
|
40
|
-
if (e.key === "Escape") {
|
|
41
|
-
e.preventDefault();
|
|
42
|
-
handleClear();
|
|
43
|
-
}
|
|
44
|
-
}, [handleClear]), wrapperRef);
|
|
45
|
-
useEffect(() => {
|
|
46
|
-
value !== undefined && setControlledValue(value);
|
|
47
|
-
}, [value]);
|
|
48
|
-
return (React.createElement("div", { ref: setWrapperRef, className: cl(className, "navds-form-field", `navds-form-field--${size !== null && size !== void 0 ? size : "medium"}`, "navds-search-field", {
|
|
22
|
+
const { inputProps, errorId, showErrorMsg, hasError, size, inputDescriptionId, } = useFormField(props, "searchfield");
|
|
23
|
+
const { className, hideLabel, children, label, description, error } = props, rest = __rest(props, ["className", "hideLabel", "children", "label", "description", "error"]);
|
|
24
|
+
return (React.createElement("div", Object.assign({ ref: ref }, omit(rest, ["id", "error", "errorId", "size", "disabled"]), { className: cl(className, "navds-form-field", `navds-form-field--${size !== null && size !== void 0 ? size : "medium"}`, "navds-search-field", {
|
|
25
|
+
"navds-search-field--error": hasError,
|
|
49
26
|
"navds-search-field--disabled": !!inputProps.disabled,
|
|
50
|
-
|
|
51
|
-
}) },
|
|
27
|
+
}) }),
|
|
52
28
|
React.createElement(Label, { htmlFor: inputProps.id, size: size, as: "label", className: cl("navds-text-field__label", {
|
|
53
29
|
"navds-sr-only": hideLabel,
|
|
54
30
|
}) }, label),
|
|
55
31
|
!!description && (React.createElement(BodyShort, { as: "div", className: cl("navds-text-field__description", {
|
|
56
32
|
"navds-sr-only": hideLabel,
|
|
57
33
|
}), id: inputDescriptionId, size: size }, description)),
|
|
58
|
-
React.createElement("div", {
|
|
59
|
-
React.createElement(
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
React.createElement(Close, { "aria-hidden": true }))))));
|
|
34
|
+
React.createElement("div", { className: "navds-search-field__input-wrapper" },
|
|
35
|
+
React.createElement(SearchFieldContext.Provider, { value: {
|
|
36
|
+
inputProps,
|
|
37
|
+
size,
|
|
38
|
+
} }, children)),
|
|
39
|
+
React.createElement("div", { id: errorId, "aria-relevant": "additions removals", "aria-live": "polite" }, showErrorMsg && React.createElement(ErrorMessage, { size: size }, error))));
|
|
65
40
|
});
|
|
41
|
+
SearchField.Button = SearchFieldButton;
|
|
42
|
+
SearchField.Clear = SearchFieldClearButton;
|
|
43
|
+
SearchField.Input = SearchFieldInput;
|
|
66
44
|
export default SearchField;
|
|
67
45
|
//# sourceMappingURL=SearchField.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SearchField.js","sourceRoot":"","sources":["../../../src/form/search-field/SearchField.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"SearchField.js","sourceRoot":"","sources":["../../../src/form/search-field/SearchField.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AAC/C,OAAO,YAAY,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAkB,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/D,OAAO,iBAA4C,MAAM,qBAAqB,CAAC;AAC/E,OAAO,sBAEN,MAAM,0BAA0B,CAAC;AAClC,OAAO,gBAA0C,MAAM,oBAAoB,CAAC;AAY5E,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,CAAC,aAAa,CACnD,IAAI,CACL,CAAC;AA4BF,MAAM,WAAW,GAAG,UAAU,CAC5B,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;IACb,MAAM,EACJ,UAAU,EACV,OAAO,EACP,YAAY,EACZ,QAAQ,EACR,IAAI,EACJ,kBAAkB,GACnB,GAAG,YAAY,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;IAEvC,MAAM,EACJ,SAAS,EACT,SAAS,EACT,QAAQ,EACR,KAAK,EACL,WAAW,EACX,KAAK,KAEH,KAAK,EADJ,IAAI,UACL,KAAK,EARH,uEAQL,CAAQ,CAAC;IAEV,OAAO,CACL,2CACE,GAAG,EAAE,GAAG,IACJ,IAAI,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC,IAC9D,SAAS,EAAE,EAAE,CACX,SAAS,EACT,kBAAkB,EAClB,qBAAqB,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,QAAQ,EAAE,EACvC,oBAAoB,EACpB;YACE,2BAA2B,EAAE,QAAQ;YACrC,8BAA8B,EAAE,CAAC,CAAC,UAAU,CAAC,QAAQ;SACtD,CACF;QAED,oBAAC,KAAK,IACJ,OAAO,EAAE,UAAU,CAAC,EAAE,EACtB,IAAI,EAAE,IAAI,EACV,EAAE,EAAC,OAAO,EACV,SAAS,EAAE,EAAE,CAAC,yBAAyB,EAAE;gBACvC,eAAe,EAAE,SAAS;aAC3B,CAAC,IAED,KAAK,CACA;QACP,CAAC,CAAC,WAAW,IAAI,CAChB,oBAAC,SAAS,IACR,EAAE,EAAC,KAAK,EACR,SAAS,EAAE,EAAE,CAAC,+BAA+B,EAAE;gBAC7C,eAAe,EAAE,SAAS;aAC3B,CAAC,EACF,EAAE,EAAE,kBAAkB,EACtB,IAAI,EAAE,IAAI,IAET,WAAW,CACF,CACb;QACD,6BAAK,SAAS,EAAC,mCAAmC;YAChD,oBAAC,kBAAkB,CAAC,QAAQ,IAC1B,KAAK,EAAE;oBACL,UAAU;oBACV,IAAI;iBACL,IAEA,QAAQ,CACmB,CAC1B;QACN,6BAAK,EAAE,EAAE,OAAO,mBAAgB,oBAAoB,eAAW,QAAQ,IACpE,YAAY,IAAI,oBAAC,YAAY,IAAC,IAAI,EAAE,IAAI,IAAG,KAAK,CAAgB,CAC7D,CACF,CACP,CAAC;AACJ,CAAC,CACsB,CAAC;AAE1B,WAAW,CAAC,MAAM,GAAG,iBAAiB,CAAC;AACvC,WAAW,CAAC,KAAK,GAAG,sBAAsB,CAAC;AAC3C,WAAW,CAAC,KAAK,GAAG,gBAAgB,CAAC;AAErC,eAAe,WAAW,CAAC"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import React from "react";
|
|
2
|
+
import { ButtonProps } from "../..";
|
|
3
|
+
export interface SearchFieldButtonProps extends Omit<ButtonProps, "size"> {
|
|
4
|
+
/**
|
|
5
|
+
* Button text
|
|
6
|
+
* @example <Search /> <span>Søk</span>
|
|
7
|
+
*/
|
|
8
|
+
children: React.ReactNode;
|
|
9
|
+
/**
|
|
10
|
+
* Changes design and interactions
|
|
11
|
+
* @default "primary"
|
|
12
|
+
*/
|
|
13
|
+
variant?: "primary" | "secondary";
|
|
14
|
+
}
|
|
15
|
+
export declare type SearchFieldButtonType = React.ForwardRefExoticComponent<SearchFieldButtonProps & React.RefAttributes<HTMLButtonElement>>;
|
|
16
|
+
declare const SearchFieldButton: SearchFieldButtonType;
|
|
17
|
+
export default SearchFieldButton;
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
var __rest = (this && this.__rest) || function (s, e) {
|
|
2
|
+
var t = {};
|
|
3
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
|
|
4
|
+
t[p] = s[p];
|
|
5
|
+
if (s != null && typeof Object.getOwnPropertySymbols === "function")
|
|
6
|
+
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
|
|
7
|
+
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
|
|
8
|
+
t[p[i]] = s[p[i]];
|
|
9
|
+
}
|
|
10
|
+
return t;
|
|
11
|
+
};
|
|
12
|
+
import React, { forwardRef, useContext } from "react";
|
|
13
|
+
import cl from "classnames";
|
|
14
|
+
import { SearchFieldContext } from "./SearchField";
|
|
15
|
+
import { Button } from "../..";
|
|
16
|
+
const SearchFieldButton = forwardRef((_a, ref) => {
|
|
17
|
+
var { className, variant = "primary", disabled } = _a, rest = __rest(_a, ["className", "variant", "disabled"]);
|
|
18
|
+
const searchField = useContext(SearchFieldContext);
|
|
19
|
+
if (searchField === null) {
|
|
20
|
+
console.warn("SearchFieldButton has to be wrapped in <SearchField />");
|
|
21
|
+
return null;
|
|
22
|
+
}
|
|
23
|
+
const { size, inputProps } = searchField;
|
|
24
|
+
return (React.createElement(Button, Object.assign({ ref: ref, className: cl(className, "navds-search-field__button") }, rest, { size: size, variant: variant, disabled: disabled !== null && disabled !== void 0 ? disabled : inputProps === null || inputProps === void 0 ? void 0 : inputProps.disabled })));
|
|
25
|
+
});
|
|
26
|
+
export default SearchFieldButton;
|
|
27
|
+
//# sourceMappingURL=SearchFieldButton.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"SearchFieldButton.js","sourceRoot":"","sources":["../../../src/form/search-field/SearchFieldButton.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AACtD,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,MAAM,EAAe,MAAM,OAAO,CAAC;AAmB5C,MAAM,iBAAiB,GAA0B,UAAU,CACzD,CAAC,EAAqD,EAAE,GAAG,EAAE,EAAE;QAA9D,EAAE,SAAS,EAAE,OAAO,GAAG,SAAS,EAAE,QAAQ,OAAW,EAAN,IAAI,cAAnD,oCAAqD,CAAF;IAClD,MAAM,WAAW,GAAG,UAAU,CAAC,kBAAkB,CAAC,CAAC;IAEnD,IAAI,WAAW,KAAK,IAAI,EAAE;QACxB,OAAO,CAAC,IAAI,CAAC,wDAAwD,CAAC,CAAC;QACvE,OAAO,IAAI,CAAC;KACb;IAED,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,WAAW,CAAC;IAEzC,OAAO,CACL,oBAAC,MAAM,kBACL,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,EAAE,CAAC,SAAS,EAAE,4BAA4B,CAAC,IAClD,IAAI,IACR,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,QAAQ,IAC1C,CACH,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,eAAe,iBAAiB,CAAC"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import React from "react";
|
|
2
|
+
import { ButtonProps } from "../..";
|
|
3
|
+
export interface SearchFieldClearButtonProps extends Omit<ButtonProps, "size"> {
|
|
4
|
+
/**
|
|
5
|
+
* Button text
|
|
6
|
+
* @example <Close /> <span>Søk</span>
|
|
7
|
+
*/
|
|
8
|
+
children: React.ReactNode;
|
|
9
|
+
/**
|
|
10
|
+
* Changes design and interactions
|
|
11
|
+
* @default "secondary"
|
|
12
|
+
*/
|
|
13
|
+
variant?: "primary" | "secondary";
|
|
14
|
+
}
|
|
15
|
+
export declare type SearchFieldClearButtonType = React.ForwardRefExoticComponent<SearchFieldClearButtonProps & React.RefAttributes<HTMLButtonElement>>;
|
|
16
|
+
declare const SearchFieldClearButton: SearchFieldClearButtonType;
|
|
17
|
+
export default SearchFieldClearButton;
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
var __rest = (this && this.__rest) || function (s, e) {
|
|
2
|
+
var t = {};
|
|
3
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
|
|
4
|
+
t[p] = s[p];
|
|
5
|
+
if (s != null && typeof Object.getOwnPropertySymbols === "function")
|
|
6
|
+
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
|
|
7
|
+
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
|
|
8
|
+
t[p[i]] = s[p[i]];
|
|
9
|
+
}
|
|
10
|
+
return t;
|
|
11
|
+
};
|
|
12
|
+
import React, { forwardRef, useContext } from "react";
|
|
13
|
+
import cl from "classnames";
|
|
14
|
+
import { SearchFieldContext } from "./SearchField";
|
|
15
|
+
import { Button } from "../..";
|
|
16
|
+
const SearchFieldClearButton = forwardRef((_a, ref) => {
|
|
17
|
+
var { className, variant = "secondary", disabled } = _a, rest = __rest(_a, ["className", "variant", "disabled"]);
|
|
18
|
+
const searchField = useContext(SearchFieldContext);
|
|
19
|
+
if (searchField === null) {
|
|
20
|
+
console.warn("SearchFieldClearButton has to be wrapped in <SearchField />");
|
|
21
|
+
return null;
|
|
22
|
+
}
|
|
23
|
+
const { size, inputProps } = searchField;
|
|
24
|
+
return (React.createElement(Button, Object.assign({}, rest, { ref: ref, className: cl(className, "navds-search-field__clear-button"), size: size, variant: variant, disabled: disabled !== null && disabled !== void 0 ? disabled : inputProps === null || inputProps === void 0 ? void 0 : inputProps.disabled })));
|
|
25
|
+
});
|
|
26
|
+
export default SearchFieldClearButton;
|
|
27
|
+
//# sourceMappingURL=SearchFieldClearButton.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"SearchFieldClearButton.js","sourceRoot":"","sources":["../../../src/form/search-field/SearchFieldClearButton.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AACtD,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,MAAM,EAAe,MAAM,OAAO,CAAC;AAmB5C,MAAM,sBAAsB,GAA+B,UAAU,CACnE,CAAC,EAAuD,EAAE,GAAG,EAAE,EAAE;QAAhE,EAAE,SAAS,EAAE,OAAO,GAAG,WAAW,EAAE,QAAQ,OAAW,EAAN,IAAI,cAArD,oCAAuD,CAAF;IACpD,MAAM,WAAW,GAAG,UAAU,CAAC,kBAAkB,CAAC,CAAC;IAEnD,IAAI,WAAW,KAAK,IAAI,EAAE;QACxB,OAAO,CAAC,IAAI,CACV,6DAA6D,CAC9D,CAAC;QACF,OAAO,IAAI,CAAC;KACb;IAED,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,WAAW,CAAC;IAEzC,OAAO,CACL,oBAAC,MAAM,oBACD,IAAI,IACR,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,EAAE,CAAC,SAAS,EAAE,kCAAkC,CAAC,EAC5D,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,QAAQ,IAC1C,CACH,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,eAAe,sBAAsB,CAAC"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import React, { InputHTMLAttributes } from "react";
|
|
2
|
+
export interface SearchFieldInputProps extends InputHTMLAttributes<HTMLInputElement> {
|
|
3
|
+
}
|
|
4
|
+
export declare type SearchFieldInputType = React.ForwardRefExoticComponent<SearchFieldInputProps & React.RefAttributes<HTMLInputElement>>;
|
|
5
|
+
declare const SearchFieldInput: SearchFieldInputType;
|
|
6
|
+
export default SearchFieldInput;
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
var __rest = (this && this.__rest) || function (s, e) {
|
|
2
|
+
var t = {};
|
|
3
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
|
|
4
|
+
t[p] = s[p];
|
|
5
|
+
if (s != null && typeof Object.getOwnPropertySymbols === "function")
|
|
6
|
+
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
|
|
7
|
+
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
|
|
8
|
+
t[p[i]] = s[p[i]];
|
|
9
|
+
}
|
|
10
|
+
return t;
|
|
11
|
+
};
|
|
12
|
+
import React, { forwardRef, useContext } from "react";
|
|
13
|
+
import cl from "classnames";
|
|
14
|
+
import { SearchFieldContext } from "./SearchField";
|
|
15
|
+
const SearchFieldInput = forwardRef((_a, ref) => {
|
|
16
|
+
var { className } = _a, rest = __rest(_a, ["className"]);
|
|
17
|
+
const searchField = useContext(SearchFieldContext);
|
|
18
|
+
if (searchField === null) {
|
|
19
|
+
console.warn("SearchFieldInput has to be wrapped in <SearchField />");
|
|
20
|
+
return null;
|
|
21
|
+
}
|
|
22
|
+
const { size, inputProps } = searchField;
|
|
23
|
+
return (React.createElement("input", Object.assign({}, rest, inputProps, { type: "search", role: "searchbox", ref: ref, className: cl(className, "navds-search-field__input", "navds-text-field__input", "navds-body-short", `navds-body-${size !== null && size !== void 0 ? size : "medium"}`) })));
|
|
24
|
+
});
|
|
25
|
+
export default SearchFieldInput;
|
|
26
|
+
//# sourceMappingURL=SearchFieldInput.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"SearchFieldInput.js","sourceRoot":"","sources":["../../../src/form/search-field/SearchFieldInput.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAuB,UAAU,EAAE,MAAM,OAAO,CAAC;AAC3E,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AASnD,MAAM,gBAAgB,GAAyB,UAAU,CACvD,CAAC,EAAsB,EAAE,GAAG,EAAE,EAAE;QAA/B,EAAE,SAAS,OAAW,EAAN,IAAI,cAApB,aAAsB,CAAF;IACnB,MAAM,WAAW,GAAG,UAAU,CAAC,kBAAkB,CAAC,CAAC;IAEnD,IAAI,WAAW,KAAK,IAAI,EAAE;QACxB,OAAO,CAAC,IAAI,CAAC,uDAAuD,CAAC,CAAC;QACtE,OAAO,IAAI,CAAC;KACb;IAED,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,WAAW,CAAC;IAEzC,OAAO,CACL,+CACM,IAAI,EACJ,UAAU,IACd,IAAI,EAAC,QAAQ,EACb,IAAI,EAAC,WAAW,EAChB,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,EAAE,CACX,SAAS,EACT,2BAA2B,EAC3B,yBAAyB,EACzB,kBAAkB,EAClB,cAAc,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,QAAQ,EAAE,CACjC,IACD,CACH,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,eAAe,gBAAgB,CAAC"}
|
package/esm/modal/Modal.d.ts
CHANGED
|
@@ -23,6 +23,11 @@ export interface ModalProps {
|
|
|
23
23
|
* User defined classname for modal
|
|
24
24
|
*/
|
|
25
25
|
className?: string;
|
|
26
|
+
/**
|
|
27
|
+
* Toggles addition of a X-button on modal
|
|
28
|
+
* @default true
|
|
29
|
+
*/
|
|
30
|
+
closeButton?: boolean;
|
|
26
31
|
}
|
|
27
32
|
interface ModalComponent extends ModalLifecycle, React.ForwardRefExoticComponent<ModalProps & React.RefAttributes<ReactModal>> {
|
|
28
33
|
Content: ModalContentType;
|
package/esm/modal/Modal.js
CHANGED
|
@@ -17,7 +17,7 @@ import { Close } from "@navikt/ds-icons";
|
|
|
17
17
|
import { Button } from "..";
|
|
18
18
|
import ModalContent from "./ModalContent";
|
|
19
19
|
const Modal = forwardRef((_a, ref) => {
|
|
20
|
-
var { children, open, onClose, className, shouldCloseOnOverlayClick = true } = _a, rest = __rest(_a, ["children", "open", "onClose", "className", "shouldCloseOnOverlayClick"]);
|
|
20
|
+
var { children, open, onClose, className, shouldCloseOnOverlayClick = true, closeButton = true } = _a, rest = __rest(_a, ["children", "open", "onClose", "className", "shouldCloseOnOverlayClick", "closeButton"]);
|
|
21
21
|
const modalRef = useRef(null);
|
|
22
22
|
const mergedRef = mergeRefs([modalRef, ref]);
|
|
23
23
|
const buttonRef = useRef(null);
|
|
@@ -31,10 +31,10 @@ const Modal = forwardRef((_a, ref) => {
|
|
|
31
31
|
};
|
|
32
32
|
return (React.createElement(ReactModal, Object.assign({}, rest, { isOpen: open, ref: mergedRef, className: cl("navds-modal", className), overlayClassName: "navds-modal__overlay", shouldCloseOnOverlayClick: shouldCloseOnOverlayClick, onRequestClose: (e) => onModalCloseRequest(e) }),
|
|
33
33
|
children,
|
|
34
|
-
React.createElement(Button, { className: cl("navds-modal__button", {
|
|
34
|
+
closeButton && (React.createElement(Button, { className: cl("navds-modal__button", {
|
|
35
35
|
"navds-modal__button--shake": shouldCloseOnOverlayClick,
|
|
36
|
-
}), size: "small", variant: "
|
|
37
|
-
React.createElement(Close, { title: "
|
|
36
|
+
}), size: "small", variant: "tertiary", ref: buttonRef, onClick: onClose },
|
|
37
|
+
React.createElement(Close, { title: "Lukk modalvindu" })))));
|
|
38
38
|
});
|
|
39
39
|
Modal.setAppElement = (element) => ReactModal.setAppElement(element);
|
|
40
40
|
Modal.Content = ModalContent;
|
package/esm/modal/Modal.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Modal.js","sourceRoot":"","sources":["../../src/modal/Modal.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAClD,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,UAAU,MAAM,aAAa,CAAC;AACrC,OAAO,SAAS,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,IAAI,CAAC;AAC5B,OAAO,YAAkC,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"Modal.js","sourceRoot":"","sources":["../../src/modal/Modal.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAClD,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,UAAU,MAAM,aAAa,CAAC;AACrC,OAAO,SAAS,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,IAAI,CAAC;AAC5B,OAAO,YAAkC,MAAM,gBAAgB,CAAC;AA2ChE,MAAM,KAAK,GAAG,UAAU,CACtB,CACE,EAQC,EACD,GAAG,EACH,EAAE;QAVF,EACE,QAAQ,EACR,IAAI,EACJ,OAAO,EACP,SAAS,EACT,yBAAyB,GAAG,IAAI,EAChC,WAAW,GAAG,IAAI,OAEnB,EADI,IAAI,cAPT,wFAQC,CADQ;IAIT,MAAM,QAAQ,GAAG,MAAM,CAAoB,IAAI,CAAC,CAAC;IACjD,MAAM,SAAS,GAAG,SAAS,CAAC,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;IAC7C,MAAM,SAAS,GAAG,MAAM,CAAoB,IAAI,CAAC,CAAC;IAElD,MAAM,mBAAmB,GAAG,CAAC,CAAC,EAAE,EAAE;QAChC,IAAI,yBAAyB,IAAI,CAAC,CAAC,IAAI,KAAK,SAAS,EAAE;YACrD,OAAO,EAAE,CAAC;SACX;aAAM,IAAI,SAAS,CAAC,OAAO,EAAE;YAC5B,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;SAC3B;IACH,CAAC,CAAC;IAEF,OAAO,CACL,oBAAC,UAAU,oBACL,IAAI,IACR,MAAM,EAAE,IAAI,EACZ,GAAG,EAAE,SAAS,EACd,SAAS,EAAE,EAAE,CAAC,aAAa,EAAE,SAAS,CAAC,EACvC,gBAAgB,EAAC,sBAAsB,EACvC,yBAAyB,EAAE,yBAAyB,EACpD,cAAc,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,mBAAmB,CAAC,CAAC,CAAC;QAE5C,QAAQ;QACR,WAAW,IAAI,CACd,oBAAC,MAAM,IACL,SAAS,EAAE,EAAE,CAAC,qBAAqB,EAAE;gBACnC,4BAA4B,EAAE,yBAAyB;aACxD,CAAC,EACF,IAAI,EAAC,OAAO,EACZ,OAAO,EAAC,UAAU,EAClB,GAAG,EAAE,SAAS,EACd,OAAO,EAAE,OAAO;YAEhB,oBAAC,KAAK,IAAC,KAAK,EAAC,iBAAiB,GAAG,CAC1B,CACV,CACU,CACd,CAAC;AACJ,CAAC,CACgB,CAAC;AAEpB,KAAK,CAAC,aAAa,GAAG,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;AACrE,KAAK,CAAC,OAAO,GAAG,YAAY,CAAC;AAE7B,eAAe,KAAK,CAAC"}
|
package/esm/util/index.d.ts
CHANGED
|
@@ -1,8 +1,3 @@
|
|
|
1
1
|
export * from "./OverridableComponent";
|
|
2
2
|
export * from "./useId";
|
|
3
3
|
export declare const omit: (obj: object, props: string[]) => {};
|
|
4
|
-
export interface ListenerT {
|
|
5
|
-
addEventListener(name: string, handler: (event?: any) => void, ...args: any[]): any;
|
|
6
|
-
removeEventListener(name: string, handler: (event?: any) => void, ...args: any[]): any;
|
|
7
|
-
}
|
|
8
|
-
export declare const useEventListener: <T extends ListenerT>(name: Parameters<ListenerT["addEventListener"]>[0], handler: Parameters<ListenerT["addEventListener"]>[1], target?: Window | T | null) => void;
|
package/esm/util/index.js
CHANGED
|
@@ -1,19 +1,6 @@
|
|
|
1
|
-
import { useEffect } from "react";
|
|
2
1
|
export * from "./OverridableComponent";
|
|
3
2
|
export * from "./useId";
|
|
4
3
|
export const omit = (obj, props) => Object.entries(obj)
|
|
5
4
|
.filter(([key]) => !props.includes(key))
|
|
6
5
|
.reduce((obj, [key, value]) => (Object.assign(Object.assign({}, obj), { [key]: value })), {});
|
|
7
|
-
/* https://github.com/streamich/react-use/blob/master/src/useEvent.ts */
|
|
8
|
-
export const useEventListener = (name, handler, target = window) => {
|
|
9
|
-
useEffect(() => {
|
|
10
|
-
if (!target) {
|
|
11
|
-
return;
|
|
12
|
-
}
|
|
13
|
-
target === null || target === void 0 ? void 0 : target.addEventListener(name, handler);
|
|
14
|
-
return () => {
|
|
15
|
-
target === null || target === void 0 ? void 0 : target.addEventListener(name, handler);
|
|
16
|
-
};
|
|
17
|
-
}, [name, handler, target]);
|
|
18
|
-
};
|
|
19
6
|
//# sourceMappingURL=index.js.map
|
package/esm/util/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,SAAS,CAAC;AAExB,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,GAAW,EAAE,KAAe,EAAE,EAAE,CACnD,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC;KAChB,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;KACvC,MAAM,CACL,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,iCAClB,GAAG,KACN,CAAC,GAAG,CAAC,EAAE,KAAK,IACZ,EACF,EAAE,CACH,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@navikt/ds-react",
|
|
3
|
-
"version": "0.14.
|
|
3
|
+
"version": "0.14.13",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "NAV designsystem react components",
|
|
6
6
|
"author": "NAV Designsystem team",
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
},
|
|
36
36
|
"dependencies": {
|
|
37
37
|
"@material-ui/core": "^4.12.3",
|
|
38
|
-
"@navikt/ds-icons": "^0.7.
|
|
38
|
+
"@navikt/ds-icons": "^0.7.3",
|
|
39
39
|
"@popperjs/core": "^2.10.1",
|
|
40
40
|
"classnames": "^2.2.6",
|
|
41
41
|
"react-collapse": "^5.1.0",
|
|
@@ -64,5 +64,5 @@
|
|
|
64
64
|
"@types/react": "^17.0.30",
|
|
65
65
|
"react": "^17.0.0"
|
|
66
66
|
},
|
|
67
|
-
"gitHead": "
|
|
67
|
+
"gitHead": "74d0b0cf1f0d0becc7b1b2768bddcc007b00e432"
|
|
68
68
|
}
|
package/src/button/Button.tsx
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
|
-
import React, { forwardRef } from "react";
|
|
1
|
+
import React, { useRef, useState, forwardRef } from "react";
|
|
2
|
+
import mergeRefs from "react-merge-refs";
|
|
2
3
|
import cl from "classnames";
|
|
3
|
-
import { BodyShort, OverridableComponent } from "../";
|
|
4
|
+
import { BodyShort, OverridableComponent, Loader } from "../";
|
|
5
|
+
import { useClientLayoutEffect } from "../util";
|
|
4
6
|
|
|
5
7
|
export interface ButtonProps
|
|
6
8
|
extends React.ButtonHTMLAttributes<HTMLButtonElement> {
|
|
@@ -24,6 +26,11 @@ export interface ButtonProps
|
|
|
24
26
|
* @default false
|
|
25
27
|
*/
|
|
26
28
|
disabled?: boolean;
|
|
29
|
+
/**
|
|
30
|
+
* Replaces button content with a Loader component, keeps width
|
|
31
|
+
* @default false
|
|
32
|
+
*/
|
|
33
|
+
loading?: boolean;
|
|
27
34
|
}
|
|
28
35
|
|
|
29
36
|
const Button: OverridableComponent<ButtonProps, HTMLButtonElement> = forwardRef(
|
|
@@ -34,25 +41,55 @@ const Button: OverridableComponent<ButtonProps, HTMLButtonElement> = forwardRef(
|
|
|
34
41
|
className,
|
|
35
42
|
children,
|
|
36
43
|
size = "medium",
|
|
44
|
+
loading = false,
|
|
45
|
+
disabled,
|
|
37
46
|
...rest
|
|
38
47
|
},
|
|
39
48
|
ref
|
|
40
|
-
) =>
|
|
41
|
-
<
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
49
|
+
) => {
|
|
50
|
+
const buttonRef = useRef<HTMLButtonElement | null>(null);
|
|
51
|
+
const mergedRef = mergeRefs([buttonRef, ref]);
|
|
52
|
+
const [widthOverride, setWidthOverride] = useState<number>();
|
|
53
|
+
|
|
54
|
+
useClientLayoutEffect(() => {
|
|
55
|
+
if (loading) {
|
|
56
|
+
const requestID = window.requestAnimationFrame(() => {
|
|
57
|
+
setWidthOverride(buttonRef?.current?.getBoundingClientRect()?.width);
|
|
58
|
+
});
|
|
59
|
+
return () => {
|
|
60
|
+
setWidthOverride(undefined);
|
|
61
|
+
cancelAnimationFrame(requestID);
|
|
62
|
+
};
|
|
63
|
+
}
|
|
64
|
+
}, [loading, children]);
|
|
65
|
+
|
|
66
|
+
return (
|
|
67
|
+
<Component
|
|
68
|
+
{...rest}
|
|
69
|
+
ref={mergedRef}
|
|
70
|
+
className={cl(
|
|
71
|
+
className,
|
|
72
|
+
"navds-button",
|
|
73
|
+
`navds-button--${variant}`,
|
|
74
|
+
`navds-button--${size}`,
|
|
75
|
+
{
|
|
76
|
+
"navds-button--loading": widthOverride,
|
|
77
|
+
}
|
|
78
|
+
)}
|
|
79
|
+
style={{ width: widthOverride }}
|
|
80
|
+
disabled={disabled ?? widthOverride ? true : undefined}
|
|
81
|
+
>
|
|
82
|
+
<BodyShort
|
|
83
|
+
as="span"
|
|
84
|
+
className="navds-button__inner"
|
|
85
|
+
size={size}
|
|
86
|
+
aria-live="polite"
|
|
87
|
+
>
|
|
88
|
+
{widthOverride ? <Loader size={size} /> : children}
|
|
89
|
+
</BodyShort>
|
|
90
|
+
</Component>
|
|
91
|
+
);
|
|
92
|
+
}
|
|
56
93
|
);
|
|
57
94
|
|
|
58
95
|
export default Button;
|
|
@@ -45,26 +45,32 @@ Button har to størrelser: Default 48px min-height og small 32px min-height
|
|
|
45
45
|
</Button>
|
|
46
46
|
</Canvas>
|
|
47
47
|
|
|
48
|
-
##
|
|
48
|
+
## Loading
|
|
49
49
|
|
|
50
|
-
|
|
51
|
-
bli justert
|
|
50
|
+
Button har en egen `loading`-prop setter knappen til disabled og viser `Loader`.
|
|
51
|
+
Button width bli automatisk justert basert på innholdet sin bredde.
|
|
52
52
|
|
|
53
53
|
<Canvas>
|
|
54
|
-
<Button>
|
|
55
|
-
|
|
54
|
+
<Button loading variant="primary">
|
|
55
|
+
Primary
|
|
56
56
|
</Button>
|
|
57
|
-
<Button
|
|
58
|
-
|
|
59
|
-
Laster...
|
|
60
|
-
<Loader />
|
|
57
|
+
<Button loading variant="secondary">
|
|
58
|
+
Secondary
|
|
61
59
|
</Button>
|
|
60
|
+
</Canvas>
|
|
61
|
+
|
|
62
|
+
## Med ikon
|
|
63
|
+
|
|
64
|
+
Hvis man setter ikoner (svg) rett på button vil størrelsen
|
|
65
|
+
bli justert automatisk og sentrert.
|
|
66
|
+
|
|
67
|
+
<Canvas>
|
|
62
68
|
<Button>
|
|
63
|
-
<Success />
|
|
69
|
+
<Success /> Knapp <Success />
|
|
64
70
|
</Button>
|
|
65
71
|
<Button size="small">
|
|
66
72
|
<Success />
|
|
67
|
-
|
|
73
|
+
Knapp
|
|
68
74
|
<Success />
|
|
69
75
|
</Button>
|
|
70
76
|
</Canvas>
|