@navikt/ds-react 0.17.27 → 0.18.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.
- package/cjs/form/search/Search.js +1 -2
- package/cjs/form/search/SearchButton.js +3 -6
- package/esm/form/search/Search.d.ts +0 -5
- package/esm/form/search/Search.js +1 -2
- package/esm/form/search/Search.js.map +1 -1
- package/esm/form/search/SearchButton.js +3 -6
- package/esm/form/search/SearchButton.js.map +1 -1
- package/package.json +2 -2
- package/src/form/search/Search.tsx +0 -7
- package/src/form/search/SearchButton.tsx +2 -6
- package/src/form/search/search.stories.tsx +0 -1
- package/src/read-more/read-more.stories.tsx +1 -1
|
@@ -48,7 +48,7 @@ const useSearch_1 = require("./useSearch");
|
|
|
48
48
|
exports.SearchContext = react_1.default.createContext(null);
|
|
49
49
|
const Search = (0, react_1.forwardRef)((props, ref) => {
|
|
50
50
|
const { inputProps, size = "medium", inputDescriptionId } = (0, useSearch_1.useSearch)(props, "searchfield");
|
|
51
|
-
const { className, hideLabel = true, label, description, value, clearButtonLabel, onClear, clearButton = true, children,
|
|
51
|
+
const { className, hideLabel = true, label, description, value, clearButtonLabel, onClear, clearButton = true, children, variant = "primary", defaultValue, onChange } = props, rest = __rest(props, ["className", "hideLabel", "label", "description", "value", "clearButtonLabel", "onClear", "clearButton", "children", "variant", "defaultValue", "onChange"]);
|
|
52
52
|
const searchRef = (0, react_1.useRef)(null);
|
|
53
53
|
const mergedRef = (0, react_merge_refs_1.default)([searchRef, ref]);
|
|
54
54
|
const [wrapperRef, setWrapperRef] = (0, react_1.useState)(null);
|
|
@@ -89,7 +89,6 @@ const Search = (0, react_1.forwardRef)((props, ref) => {
|
|
|
89
89
|
size,
|
|
90
90
|
disabled: inputProps.disabled,
|
|
91
91
|
variant,
|
|
92
|
-
onSearch: () => onSearch === null || onSearch === void 0 ? void 0 : onSearch(value !== null && value !== void 0 ? value : internalValue),
|
|
93
92
|
} }, children ? children : variant !== "simple" && react_1.default.createElement(SearchButton_1.default, null)))));
|
|
94
93
|
});
|
|
95
94
|
Search.Button = SearchButton_1.default;
|
|
@@ -44,17 +44,14 @@ const __1 = require("../..");
|
|
|
44
44
|
const Search_1 = require("./Search");
|
|
45
45
|
const SearchButton = (0, react_1.forwardRef)((_a, ref) => {
|
|
46
46
|
var _b;
|
|
47
|
-
var { className, children, disabled
|
|
47
|
+
var { className, children, disabled } = _a, rest = __rest(_a, ["className", "children", "disabled"]);
|
|
48
48
|
const context = (0, react_1.useContext)(Search_1.SearchContext);
|
|
49
49
|
if (context === null) {
|
|
50
50
|
console.warn("<Search.Button> has to be wrapped in <Search />");
|
|
51
51
|
return null;
|
|
52
52
|
}
|
|
53
|
-
const { size, variant
|
|
54
|
-
return (react_1.default.createElement(__1.Button, Object.assign({ type: "submit" }, rest, { ref: ref, size: size, variant: variant === "secondary" ? "secondary" : "primary", 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
|
|
55
|
-
onSearch === null || onSearch === void 0 ? void 0 : onSearch();
|
|
56
|
-
onClick === null || onClick === void 0 ? void 0 : onClick(e);
|
|
57
|
-
} }),
|
|
53
|
+
const { size, variant } = context;
|
|
54
|
+
return (react_1.default.createElement(__1.Button, Object.assign({ type: "submit" }, rest, { ref: ref, size: size, variant: variant === "secondary" ? "secondary" : "primary", 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 }),
|
|
58
55
|
react_1.default.createElement(ds_icons_1.Search, { "aria-hidden": true }),
|
|
59
56
|
children ? children : react_1.default.createElement("span", { className: "navds-sr-only" }, "S\u00F8k")));
|
|
60
57
|
});
|
|
@@ -24,10 +24,6 @@ export interface SearchProps extends Omit<FormFieldProps, "error" | "errorId">,
|
|
|
24
24
|
* Callback for value-change in input
|
|
25
25
|
*/
|
|
26
26
|
onChange?: (value: string) => void;
|
|
27
|
-
/**
|
|
28
|
-
* Callback for <Search.Button/> click or onSubmit in form
|
|
29
|
-
*/
|
|
30
|
-
onSearch?: (value: string | number | readonly string[]) => void;
|
|
31
27
|
/**
|
|
32
28
|
* Callback for click on clear-button or Escape keydown
|
|
33
29
|
*/
|
|
@@ -55,7 +51,6 @@ export interface SearchContextProps {
|
|
|
55
51
|
disabled?: boolean;
|
|
56
52
|
size: "medium" | "small";
|
|
57
53
|
variant: "primary" | "secondary" | "simple";
|
|
58
|
-
onSearch: () => void;
|
|
59
54
|
}
|
|
60
55
|
export declare const SearchContext: React.Context<SearchContextProps | null>;
|
|
61
56
|
declare const Search: SearchComponent;
|
|
@@ -19,7 +19,7 @@ import { useSearch } from "./useSearch";
|
|
|
19
19
|
export const SearchContext = React.createContext(null);
|
|
20
20
|
const Search = forwardRef((props, ref) => {
|
|
21
21
|
const { inputProps, size = "medium", inputDescriptionId } = useSearch(props, "searchfield");
|
|
22
|
-
const { className, hideLabel = true, label, description, value, clearButtonLabel, onClear, clearButton = true, children,
|
|
22
|
+
const { className, hideLabel = true, label, description, value, clearButtonLabel, onClear, clearButton = true, children, variant = "primary", defaultValue, onChange } = props, rest = __rest(props, ["className", "hideLabel", "label", "description", "value", "clearButtonLabel", "onClear", "clearButton", "children", "variant", "defaultValue", "onChange"]);
|
|
23
23
|
const searchRef = useRef(null);
|
|
24
24
|
const mergedRef = mergeRefs([searchRef, ref]);
|
|
25
25
|
const [wrapperRef, setWrapperRef] = useState(null);
|
|
@@ -60,7 +60,6 @@ const Search = forwardRef((props, ref) => {
|
|
|
60
60
|
size,
|
|
61
61
|
disabled: inputProps.disabled,
|
|
62
62
|
variant,
|
|
63
|
-
onSearch: () => onSearch === null || onSearch === void 0 ? void 0 : onSearch(value !== null && value !== void 0 ? value : internalValue),
|
|
64
63
|
} }, children ? children : variant !== "simple" && React.createElement(SearchButton, null)))));
|
|
65
64
|
});
|
|
66
65
|
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,IAAI,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,KAAK,EAAE,EACZ,UAAU,EAEV,WAAW,EACX,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;
|
|
1
|
+
{"version":3,"file":"Search.js","sourceRoot":"","sources":["../../../src/form/search/Search.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,KAAK,EAAE,EACZ,UAAU,EAEV,WAAW,EACX,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;AA6DxC,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,OAAO,GAAG,SAAS,EACnB,YAAY,EACZ,QAAQ,KAEN,KAAK,EADJ,IAAI,UACL,KAAK,EAdH,4JAcL,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,CAAwB,IAAI,CAAC,CAAC;IAE1E,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,QAAQ,CAAC,YAAY,aAAZ,YAAY,cAAZ,YAAY,GAAI,EAAE,CAAC,CAAC;IAEvE,MAAM,YAAY,GAAG,WAAW,CAC9B,CAAC,CAAS,EAAE,EAAE;QACZ,KAAK,KAAK,SAAS,IAAI,gBAAgB,CAAC,CAAC,CAAC,CAAC;QAC3C,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,CAAC,CAAC,CAAC;IAChB,CAAC,EACD,CAAC,QAAQ,EAAE,KAAK,CAAC,CAClB,CAAC;IAEF,MAAM,WAAW,GAAG,WAAW,CAC7B,CAAC,KAAuB,EAAE,EAAE;;QAC1B,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,KAAK,CAAC,CAAC;QACjB,YAAY,CAAC,EAAE,CAAC,CAAC;QACjB,SAAS,CAAC,OAAO,KAAI,MAAA,MAAA,SAAS,CAAC,OAAO,0CAAE,KAAK,kDAAI,CAAA,CAAC;IACpD,CAAC,EACD,CAAC,YAAY,EAAE,OAAO,CAAC,CACxB,CAAC;IAEF,gBAAgB,CACd,SAAS,EACT,WAAW,CACT,CAAC,CAAC,EAAE,EAAE;QACJ,IAAI,CAAC,CAAC,GAAG,KAAK,QAAQ,EAAE;YACtB,CAAC,CAAC,cAAc,EAAE,CAAC;YACnB,WAAW,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;SAC9C;IACH,CAAC,EACD,CAAC,WAAW,CAAC,CACd,EACD,UAAU,CACX,CAAC;IAEF,OAAO,CACL,6BACE,GAAG,EAAE,aAAa,EAClB,SAAS,EAAE,EAAE,CACX,SAAS,EACT,kBAAkB,EAClB,qBAAqB,IAAI,EAAE,EAC3B,cAAc,EACd;YACE,wBAAwB,EAAE,CAAC,CAAC,UAAU,CAAC,QAAQ;SAChD,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,uBAAuB;YACpC,6BAAK,SAAS,EAAC,6BAA6B;gBACzC,OAAO,KAAK,QAAQ,IAAI,CACvB,oBAAC,UAAU,yBAAa,SAAS,EAAC,2BAA2B,GAAG,CACjE;gBACD,6CACE,GAAG,EAAE,SAAS,IACV,IAAI,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,CAAC,EACpB,UAAU,IACd,KAAK,EAAE,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,aAAa,EAC7B,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAC7C,IAAI,EAAC,QAAQ,EACb,IAAI,EAAC,WAAW,EAChB,SAAS,EAAE,EAAE,CACX,SAAS,EACT,qBAAqB,EACrB,wBAAwB,OAAO,EAAE,EACjC,yBAAyB,EACzB,kBAAkB,EAClB,cAAc,IAAI,EAAE,CACrB,IACD;gBACD,CAAC,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,aAAa,CAAC,IAAI,WAAW,IAAI,CAC1C,gCACE,IAAI,EAAC,QAAQ,EACb,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAC3D,SAAS,EAAC,4BAA4B;oBAEtC,8BAAM,SAAS,EAAC,eAAe,IAC5B,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,KAAK,CACvC;oBACP,oBAAC,KAAK,0BAAe,CACd,CACV,CACG;YACN,oBAAC,aAAa,CAAC,QAAQ,IACrB,KAAK,EAAE;oBACL,IAAI;oBACJ,QAAQ,EAAE,UAAU,CAAC,QAAQ;oBAC7B,OAAO;iBACR,IAEA,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,KAAK,QAAQ,IAAI,oBAAC,YAAY,OAAG,CACxC,CACrB,CACF,CACP,CAAC;AACJ,CAAC,CAAoB,CAAC;AAEtB,MAAM,CAAC,MAAM,GAAG,YAAY,CAAC;AAE7B,eAAe,MAAM,CAAC"}
|
|
@@ -16,17 +16,14 @@ import { Button } from "../..";
|
|
|
16
16
|
import { SearchContext } from "./Search";
|
|
17
17
|
const SearchButton = forwardRef((_a, ref) => {
|
|
18
18
|
var _b;
|
|
19
|
-
var { className, children, disabled
|
|
19
|
+
var { className, children, disabled } = _a, rest = __rest(_a, ["className", "children", "disabled"]);
|
|
20
20
|
const context = useContext(SearchContext);
|
|
21
21
|
if (context === null) {
|
|
22
22
|
console.warn("<Search.Button> has to be wrapped in <Search />");
|
|
23
23
|
return null;
|
|
24
24
|
}
|
|
25
|
-
const { size, variant
|
|
26
|
-
return (React.createElement(Button, Object.assign({ type: "submit" }, rest, { ref: ref, size: size, variant: variant === "secondary" ? "secondary" : "primary", className: cl("navds-search__button-search", className), disabled: (_b = context === null || context === void 0 ? void 0 : context.disabled) !== null && _b !== void 0 ? _b : disabled
|
|
27
|
-
onSearch === null || onSearch === void 0 ? void 0 : onSearch();
|
|
28
|
-
onClick === null || onClick === void 0 ? void 0 : onClick(e);
|
|
29
|
-
} }),
|
|
25
|
+
const { size, variant } = context;
|
|
26
|
+
return (React.createElement(Button, Object.assign({ type: "submit" }, rest, { ref: ref, size: size, variant: variant === "secondary" ? "secondary" : "primary", className: cl("navds-search__button-search", className), disabled: (_b = context === null || context === void 0 ? void 0 : context.disabled) !== null && _b !== void 0 ? _b : disabled }),
|
|
30
27
|
React.createElement(Search, { "aria-hidden": true }),
|
|
31
28
|
children ? children : React.createElement("span", { className: "navds-sr-only" }, "S\u00F8k")));
|
|
32
29
|
});
|
|
@@ -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,
|
|
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,EAA0C,EAAE,GAAG,EAAE,EAAE;;QAAnD,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,OAAW,EAAN,IAAI,cAAxC,qCAA0C,CAAF;IACvC,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,GAAG,OAAO,CAAC;IAElC,OAAO,CACL,oBAAC,MAAM,kBACL,IAAI,EAAC,QAAQ,IACT,IAAI,IACR,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,OAAO,KAAK,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,EAC1D,SAAS,EAAE,EAAE,CAAC,6BAA6B,EAAE,SAAS,CAAC,EACvD,QAAQ,EAAE,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,mCAAI,QAAQ;QAEvC,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.
|
|
3
|
+
"version": "0.18.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "NAV designsystem react components",
|
|
6
6
|
"author": "NAV Designsystem team",
|
|
@@ -69,5 +69,5 @@
|
|
|
69
69
|
"@types/react": "^17.0.30 || ^18.0.0",
|
|
70
70
|
"react": "^17.0.0 || ^18.0.0"
|
|
71
71
|
},
|
|
72
|
-
"gitHead": "
|
|
72
|
+
"gitHead": "86ddb14c82fc7edce3fa57256fe30dd31715025f"
|
|
73
73
|
}
|
|
@@ -38,10 +38,6 @@ export interface SearchProps
|
|
|
38
38
|
* Callback for value-change in input
|
|
39
39
|
*/
|
|
40
40
|
onChange?: (value: string) => void;
|
|
41
|
-
/**
|
|
42
|
-
* Callback for <Search.Button/> click or onSubmit in form
|
|
43
|
-
*/
|
|
44
|
-
onSearch?: (value: string | number | readonly string[]) => void;
|
|
45
41
|
/**
|
|
46
42
|
* Callback for click on clear-button or Escape keydown
|
|
47
43
|
*/
|
|
@@ -74,7 +70,6 @@ export interface SearchContextProps {
|
|
|
74
70
|
disabled?: boolean;
|
|
75
71
|
size: "medium" | "small";
|
|
76
72
|
variant: "primary" | "secondary" | "simple";
|
|
77
|
-
onSearch: () => void;
|
|
78
73
|
}
|
|
79
74
|
|
|
80
75
|
export const SearchContext = React.createContext<SearchContextProps | null>(
|
|
@@ -97,7 +92,6 @@ const Search = forwardRef<HTMLInputElement, SearchProps>((props, ref) => {
|
|
|
97
92
|
onClear,
|
|
98
93
|
clearButton = true,
|
|
99
94
|
children,
|
|
100
|
-
onSearch,
|
|
101
95
|
variant = "primary",
|
|
102
96
|
defaultValue,
|
|
103
97
|
onChange,
|
|
@@ -216,7 +210,6 @@ const Search = forwardRef<HTMLInputElement, SearchProps>((props, ref) => {
|
|
|
216
210
|
size,
|
|
217
211
|
disabled: inputProps.disabled,
|
|
218
212
|
variant,
|
|
219
|
-
onSearch: () => onSearch?.(value ?? internalValue),
|
|
220
213
|
}}
|
|
221
214
|
>
|
|
222
215
|
{children ? children : variant !== "simple" && <SearchButton />}
|
|
@@ -17,7 +17,7 @@ export type SearchButtonType = React.ForwardRefExoticComponent<
|
|
|
17
17
|
>;
|
|
18
18
|
|
|
19
19
|
const SearchButton: SearchButtonType = forwardRef(
|
|
20
|
-
({ className, children, disabled,
|
|
20
|
+
({ className, children, disabled, ...rest }, ref) => {
|
|
21
21
|
const context = useContext(SearchContext);
|
|
22
22
|
|
|
23
23
|
if (context === null) {
|
|
@@ -25,7 +25,7 @@ const SearchButton: SearchButtonType = forwardRef(
|
|
|
25
25
|
return null;
|
|
26
26
|
}
|
|
27
27
|
|
|
28
|
-
const { size, variant
|
|
28
|
+
const { size, variant } = context;
|
|
29
29
|
|
|
30
30
|
return (
|
|
31
31
|
<Button
|
|
@@ -36,10 +36,6 @@ const SearchButton: SearchButtonType = forwardRef(
|
|
|
36
36
|
variant={variant === "secondary" ? "secondary" : "primary"}
|
|
37
37
|
className={cl("navds-search__button-search", className)}
|
|
38
38
|
disabled={context?.disabled ?? disabled}
|
|
39
|
-
onClick={(e) => {
|
|
40
|
-
onSearch?.();
|
|
41
|
-
onClick?.(e);
|
|
42
|
-
}}
|
|
43
39
|
>
|
|
44
40
|
<Search aria-hidden />
|
|
45
41
|
{children ? children : <span className="navds-sr-only">Søk</span>}
|
|
@@ -33,7 +33,6 @@ export const Default = (props) => {
|
|
|
33
33
|
<Search
|
|
34
34
|
value={props.controlled ? state : undefined}
|
|
35
35
|
onChange={props.controlled ? setState : null}
|
|
36
|
-
onSearch={(v) => console.log({ onSearch: v })}
|
|
37
36
|
label="Søk"
|
|
38
37
|
size={props.size}
|
|
39
38
|
clearButton={props.clearButton}
|
|
@@ -17,7 +17,7 @@ export const All = () => {
|
|
|
17
17
|
<ReadMore
|
|
18
18
|
open={open}
|
|
19
19
|
onClick={() => setOpen(!open)}
|
|
20
|
-
header="ReadMore header text"
|
|
20
|
+
header="ReadMore header text ReadMore header text ReadMore header text ReadMore header text ReadMore header text"
|
|
21
21
|
>
|
|
22
22
|
Magna aliquip aliquip fugiat nostrud nostrud velit pariatur veniam
|
|
23
23
|
officia laboris voluptate officia pariatur.Lorem est ex anim velit
|