@navikt/ds-react 0.17.1 → 0.17.3
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/form/search/Search.js +3 -3
- package/cjs/form/search/SearchButton.js +3 -3
- package/esm/form/search/Search.d.ts +2 -2
- package/esm/form/search/Search.js +3 -3
- package/esm/form/search/Search.js.map +1 -1
- package/esm/form/search/SearchButton.js +3 -3
- package/esm/form/search/SearchButton.js.map +1 -1
- package/package.json +2 -2
- package/src/form/search/Search.tsx +6 -8
- package/src/form/search/SearchButton.tsx +3 -3
|
@@ -76,9 +76,9 @@ const Search = (0, react_1.forwardRef)((props, ref) => {
|
|
|
76
76
|
(0, react_1.useEffect)(() => {
|
|
77
77
|
value !== undefined && setControlledValue(value);
|
|
78
78
|
}, [value]);
|
|
79
|
-
return (react_1.default.createElement("
|
|
79
|
+
return (react_1.default.createElement("div", { ref: setWrapperRef, className: (0, classnames_1.default)(className, "navds-form-field", `navds-form-field--${size}`, "navds-search", {
|
|
80
80
|
"navds-search--disabled": !!inputProps.disabled,
|
|
81
|
-
})
|
|
81
|
+
}) },
|
|
82
82
|
react_1.default.createElement(__1.Label, { htmlFor: inputProps.id, size: size, as: "label", className: (0, classnames_1.default)("navds-text-field__label", {
|
|
83
83
|
"navds-sr-only": hideLabel,
|
|
84
84
|
}) }, label),
|
|
@@ -94,8 +94,8 @@ const Search = (0, react_1.forwardRef)((props, ref) => {
|
|
|
94
94
|
react_1.default.createElement(exports.SearchContext.Provider, { value: {
|
|
95
95
|
size,
|
|
96
96
|
disabled: inputProps.disabled,
|
|
97
|
-
onSearch: () => onSearch === null || onSearch === void 0 ? void 0 : onSearch(controlledValue),
|
|
98
97
|
variant,
|
|
98
|
+
onSearch: () => onSearch === null || onSearch === void 0 ? void 0 : onSearch(controlledValue),
|
|
99
99
|
} }, children ? children : react_1.default.createElement(SearchButton_1.default, null)))));
|
|
100
100
|
});
|
|
101
101
|
Search.Button = SearchButton_1.default;
|
|
@@ -50,9 +50,9 @@ const SearchButton = (0, react_1.forwardRef)((_a, ref) => {
|
|
|
50
50
|
console.warn("<Search.Button> has to be wrapped in <Search />");
|
|
51
51
|
return null;
|
|
52
52
|
}
|
|
53
|
-
const { size,
|
|
54
|
-
return (react_1.default.createElement(__1.Button, Object.assign({ type: "
|
|
55
|
-
onSearch();
|
|
53
|
+
const { size, variant, onSearch } = context;
|
|
54
|
+
return (react_1.default.createElement(__1.Button, Object.assign({ type: "submit" }, rest, { ref: ref, size: size, variant: variant, className: (0, classnames_1.default)("navds-search__button-search", className), disabled: (_b = context === null || context === void 0 ? void 0 : context.disabled) !== null && _b !== void 0 ? _b : disabled, onClick: (e) => {
|
|
55
|
+
onSearch === null || onSearch === void 0 ? void 0 : onSearch();
|
|
56
56
|
onClick === null || onClick === void 0 ? void 0 : onClick(e);
|
|
57
57
|
} }),
|
|
58
58
|
react_1.default.createElement(ds_icons_1.Search, { "aria-hidden": true }),
|
|
@@ -25,7 +25,7 @@ export interface SearchProps extends Omit<FormFieldProps, "error" | "errorId">,
|
|
|
25
25
|
*/
|
|
26
26
|
onChange?: (value: string) => void;
|
|
27
27
|
/**
|
|
28
|
-
* Callback for <Search.Button/> click
|
|
28
|
+
* Callback for <Search.Button/> click or onSubmit in form
|
|
29
29
|
*/
|
|
30
30
|
onSearch?: (value: string | number | readonly string[]) => void;
|
|
31
31
|
/**
|
|
@@ -54,8 +54,8 @@ interface SearchComponent extends React.ForwardRefExoticComponent<SearchProps &
|
|
|
54
54
|
export interface SearchContextProps {
|
|
55
55
|
disabled?: boolean;
|
|
56
56
|
size: "medium" | "small";
|
|
57
|
-
onSearch: () => void;
|
|
58
57
|
variant?: "tertiary" | "primary";
|
|
58
|
+
onSearch?: () => void;
|
|
59
59
|
}
|
|
60
60
|
export declare const SearchContext: React.Context<SearchContextProps | null>;
|
|
61
61
|
declare const Search: SearchComponent;
|
|
@@ -47,9 +47,9 @@ const Search = forwardRef((props, ref) => {
|
|
|
47
47
|
useEffect(() => {
|
|
48
48
|
value !== undefined && setControlledValue(value);
|
|
49
49
|
}, [value]);
|
|
50
|
-
return (React.createElement("
|
|
50
|
+
return (React.createElement("div", { ref: setWrapperRef, className: cl(className, "navds-form-field", `navds-form-field--${size}`, "navds-search", {
|
|
51
51
|
"navds-search--disabled": !!inputProps.disabled,
|
|
52
|
-
})
|
|
52
|
+
}) },
|
|
53
53
|
React.createElement(Label, { htmlFor: inputProps.id, size: size, as: "label", className: cl("navds-text-field__label", {
|
|
54
54
|
"navds-sr-only": hideLabel,
|
|
55
55
|
}) }, label),
|
|
@@ -65,8 +65,8 @@ const Search = forwardRef((props, ref) => {
|
|
|
65
65
|
React.createElement(SearchContext.Provider, { value: {
|
|
66
66
|
size,
|
|
67
67
|
disabled: inputProps.disabled,
|
|
68
|
-
onSearch: () => onSearch === null || onSearch === void 0 ? void 0 : onSearch(controlledValue),
|
|
69
68
|
variant,
|
|
69
|
+
onSearch: () => onSearch === null || onSearch === void 0 ? void 0 : onSearch(controlledValue),
|
|
70
70
|
} }, children ? children : React.createElement(SearchButton, null)))));
|
|
71
71
|
});
|
|
72
72
|
Search.Button = SearchButton;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Search.js","sourceRoot":"","sources":["../../../src/form/search/Search.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,KAAK,EAAE,EACZ,UAAU,EAEV,WAAW,EACX,SAAS,EACT,MAAM,EACN,QAAQ,GACT,MAAM,OAAO,CAAC;AACf,OAAO,SAAS,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAC;AAEjE,OAAO,YAAkC,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAkExC,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,CAAC,aAAa,CAC9C,IAAI,CACL,CAAC;AAEF,MAAM,MAAM,GAAG,UAAU,CAAgC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;IACtE,MAAM,EAAE,UAAU,EAAE,IAAI,GAAG,QAAQ,EAAE,kBAAkB,EAAE,GAAG,SAAS,CACnE,KAAK,EACL,aAAa,CACd,CAAC;IAEF,MAAM,EACJ,SAAS,EACT,SAAS,GAAG,IAAI,EAChB,KAAK,EACL,WAAW,EACX,KAAK,EACL,gBAAgB,EAChB,OAAO,EACP,WAAW,GAAG,IAAI,EAClB,QAAQ,EACR,QAAQ,EACR,OAAO,GAAG,UAAU,KAElB,KAAK,EADJ,IAAI,UACL,KAAK,EAbH,4IAaL,CAAQ,CAAC;IAEV,MAAM,SAAS,GAAG,MAAM,CAA0B,IAAI,CAAC,CAAC;IACxD,MAAM,SAAS,GAAG,SAAS,CAAC,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC,CAAC;IAC9C,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,QAAQ,
|
|
1
|
+
{"version":3,"file":"Search.js","sourceRoot":"","sources":["../../../src/form/search/Search.tsx"],"names":[],"mappings":"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"}
|
|
@@ -22,9 +22,9 @@ const SearchButton = forwardRef((_a, ref) => {
|
|
|
22
22
|
console.warn("<Search.Button> has to be wrapped in <Search />");
|
|
23
23
|
return null;
|
|
24
24
|
}
|
|
25
|
-
const { size,
|
|
26
|
-
return (React.createElement(Button, Object.assign({ type: "
|
|
27
|
-
onSearch();
|
|
25
|
+
const { size, variant, onSearch } = context;
|
|
26
|
+
return (React.createElement(Button, Object.assign({ type: "submit" }, rest, { ref: ref, size: size, variant: variant, className: cl("navds-search__button-search", className), disabled: (_b = context === null || context === void 0 ? void 0 : context.disabled) !== null && _b !== void 0 ? _b : disabled, onClick: (e) => {
|
|
27
|
+
onSearch === null || onSearch === void 0 ? void 0 : onSearch();
|
|
28
28
|
onClick === null || onClick === void 0 ? void 0 : onClick(e);
|
|
29
29
|
} }),
|
|
30
30
|
React.createElement(Search, { "aria-hidden": true }),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SearchButton.js","sourceRoot":"","sources":["../../../src/form/search/SearchButton.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AACtD,OAAO,EAAE,MAAM,EAAe,MAAM,OAAO,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAczC,MAAM,YAAY,GAAqB,UAAU,CAC/C,CAAC,EAAmD,EAAE,GAAG,EAAE,EAAE;;QAA5D,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,OAAW,EAAN,IAAI,cAAjD,gDAAmD,CAAF;IAChD,MAAM,OAAO,GAAG,UAAU,CAAC,aAAa,CAAC,CAAC;IAE1C,IAAI,OAAO,KAAK,IAAI,EAAE;QACpB,OAAO,CAAC,IAAI,CAAC,iDAAiD,CAAC,CAAC;QAChE,OAAO,IAAI,CAAC;KACb;IAED,MAAM,EAAE,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"SearchButton.js","sourceRoot":"","sources":["../../../src/form/search/SearchButton.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AACtD,OAAO,EAAE,MAAM,EAAe,MAAM,OAAO,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAczC,MAAM,YAAY,GAAqB,UAAU,CAC/C,CAAC,EAAmD,EAAE,GAAG,EAAE,EAAE;;QAA5D,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,OAAW,EAAN,IAAI,cAAjD,gDAAmD,CAAF;IAChD,MAAM,OAAO,GAAG,UAAU,CAAC,aAAa,CAAC,CAAC;IAE1C,IAAI,OAAO,KAAK,IAAI,EAAE;QACpB,OAAO,CAAC,IAAI,CAAC,iDAAiD,CAAC,CAAC;QAChE,OAAO,IAAI,CAAC;KACb;IAED,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAE5C,OAAO,CACL,oBAAC,MAAM,kBACL,IAAI,EAAC,QAAQ,IACT,IAAI,IACR,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,EAAE,CAAC,6BAA6B,EAAE,SAAS,CAAC,EACvD,QAAQ,EAAE,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,mCAAI,QAAQ,EACvC,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;YACb,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,EAAI,CAAC;YACb,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,CAAC,CAAC,CAAC;QACf,CAAC;QAED,oBAAC,MAAM,0BAAe;QACrB,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,8BAAM,SAAS,EAAC,eAAe,eAAW,CAC1D,CACV,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,eAAe,YAAY,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@navikt/ds-react",
|
|
3
|
-
"version": "0.17.
|
|
3
|
+
"version": "0.17.3",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "NAV designsystem react components",
|
|
6
6
|
"author": "NAV Designsystem team",
|
|
@@ -66,5 +66,5 @@
|
|
|
66
66
|
"@types/react": "^17.0.30",
|
|
67
67
|
"react": "^17.0.0"
|
|
68
68
|
},
|
|
69
|
-
"gitHead": "
|
|
69
|
+
"gitHead": "4baebb43408f7f77334c3c31a23140e04eef9a52"
|
|
70
70
|
}
|
|
@@ -40,7 +40,7 @@ export interface SearchProps
|
|
|
40
40
|
*/
|
|
41
41
|
onChange?: (value: string) => void;
|
|
42
42
|
/**
|
|
43
|
-
* Callback for <Search.Button/> click
|
|
43
|
+
* Callback for <Search.Button/> click or onSubmit in form
|
|
44
44
|
*/
|
|
45
45
|
onSearch?: (value: string | number | readonly string[]) => void;
|
|
46
46
|
/**
|
|
@@ -74,8 +74,8 @@ interface SearchComponent
|
|
|
74
74
|
export interface SearchContextProps {
|
|
75
75
|
disabled?: boolean;
|
|
76
76
|
size: "medium" | "small";
|
|
77
|
-
onSearch: () => void;
|
|
78
77
|
variant?: "tertiary" | "primary";
|
|
78
|
+
onSearch?: () => void;
|
|
79
79
|
}
|
|
80
80
|
|
|
81
81
|
export const SearchContext = React.createContext<SearchContextProps | null>(
|
|
@@ -105,7 +105,7 @@ const Search = forwardRef<HTMLInputElement, SearchProps>((props, ref) => {
|
|
|
105
105
|
|
|
106
106
|
const searchRef = useRef<HTMLInputElement | null>(null);
|
|
107
107
|
const mergedRef = mergeRefs([searchRef, ref]);
|
|
108
|
-
const [wrapperRef, setWrapperRef] = useState<
|
|
108
|
+
const [wrapperRef, setWrapperRef] = useState<HTMLDivElement | null>(null);
|
|
109
109
|
|
|
110
110
|
const [controlledValue, setControlledValue] = useState(value ?? "");
|
|
111
111
|
|
|
@@ -148,8 +148,7 @@ const Search = forwardRef<HTMLInputElement, SearchProps>((props, ref) => {
|
|
|
148
148
|
}, [value]);
|
|
149
149
|
|
|
150
150
|
return (
|
|
151
|
-
<
|
|
152
|
-
role="search"
|
|
151
|
+
<div
|
|
153
152
|
ref={setWrapperRef}
|
|
154
153
|
className={cl(
|
|
155
154
|
className,
|
|
@@ -160,7 +159,6 @@ const Search = forwardRef<HTMLInputElement, SearchProps>((props, ref) => {
|
|
|
160
159
|
"navds-search--disabled": !!inputProps.disabled,
|
|
161
160
|
}
|
|
162
161
|
)}
|
|
163
|
-
onSubmit={(e) => e.preventDefault()}
|
|
164
162
|
>
|
|
165
163
|
<Label
|
|
166
164
|
htmlFor={inputProps.id}
|
|
@@ -219,14 +217,14 @@ const Search = forwardRef<HTMLInputElement, SearchProps>((props, ref) => {
|
|
|
219
217
|
value={{
|
|
220
218
|
size,
|
|
221
219
|
disabled: inputProps.disabled,
|
|
222
|
-
onSearch: () => onSearch?.(controlledValue),
|
|
223
220
|
variant,
|
|
221
|
+
onSearch: () => onSearch?.(controlledValue),
|
|
224
222
|
}}
|
|
225
223
|
>
|
|
226
224
|
{children ? children : <SearchButton />}
|
|
227
225
|
</SearchContext.Provider>
|
|
228
226
|
</div>
|
|
229
|
-
</
|
|
227
|
+
</div>
|
|
230
228
|
);
|
|
231
229
|
}) as SearchComponent;
|
|
232
230
|
|
|
@@ -25,11 +25,11 @@ const SearchButton: SearchButtonType = forwardRef(
|
|
|
25
25
|
return null;
|
|
26
26
|
}
|
|
27
27
|
|
|
28
|
-
const { size,
|
|
28
|
+
const { size, variant, onSearch } = context;
|
|
29
29
|
|
|
30
30
|
return (
|
|
31
31
|
<Button
|
|
32
|
-
type="
|
|
32
|
+
type="submit"
|
|
33
33
|
{...rest}
|
|
34
34
|
ref={ref}
|
|
35
35
|
size={size}
|
|
@@ -37,7 +37,7 @@ const SearchButton: SearchButtonType = forwardRef(
|
|
|
37
37
|
className={cl("navds-search__button-search", className)}
|
|
38
38
|
disabled={context?.disabled ?? disabled}
|
|
39
39
|
onClick={(e) => {
|
|
40
|
-
onSearch();
|
|
40
|
+
onSearch?.();
|
|
41
41
|
onClick?.(e);
|
|
42
42
|
}}
|
|
43
43
|
>
|