Compare commits

..
Author SHA1 Message Date
github-actions[bot] 4baebb4340 Lerna versionbump [ci skip]
- @navikt/ds-react@0.17.3
 - @navikt/ds-react-internal@0.12.3
2022-03-08 10:50:29 +00:00
Ken 7866333ae2 [FIX] Search: form -> div (#1454) 2022-03-08 11:40:25 +01:00
github-actions[bot] 2f13905d61 Lerna versionbump [ci skip]
- @navikt/ds-css@0.16.2
2022-03-07 15:23:32 +00:00
KenandAndreas Nordahl 0160383ff0 [FIX] Synket ConfirmationPanel med Figma (#1437)
Co-authored-by: Andreas Nordahl <andnorda@gmail.com>
2022-03-07 16:14:04 +01:00
6 changed files with 25 additions and 18 deletions

No files matched your search

+11 -4
View File
@@ -1,15 +1,21 @@
:root {
--navds-confirmation-panel-color-background: var(
--navds-semantic-color-feedback-warning-background
--navds-global-color-orange-50
);
--navds-confirmation-panel-color-background-checked: var(
--navds-semantic-color-feedback-success-background
--navds-global-color-green-50
);
--navds-confirmation-panel-color-border: var(
--navds-semantic-color-feedback-warning-border
);
--navds-confirmation-panel-color-border-checked: var(
--navds-semantic-color-feedback-success-background
--navds-semantic-color-feedback-success-border
);
--navds-confirmation-panel-color-border-error: var(
--navds-semantic-color-feedback-danger-background
);
--navds-confirmation-panel-color-background-error: var(
--navds-semantic-color-feedback-danger-background
--navds-global-color-red-50
);
--navds-confirmation-panel-color-checkbox-background-checked-hover: var(
--navds-global-color-green-700
@@ -34,6 +40,7 @@
gap: var(--navds-spacing-4);
padding: var(--navds-spacing-4);
border-radius: 4px;
border: 1px solid var(--navds-confirmation-panel-color-border);
background-color: var(--navds-confirmation-panel-color-background);
transition: background-color linear 100ms;
}
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@navikt/ds-css",
"version": "0.16.1",
"version": "0.16.2",
"private": false,
"description": "Css for NAV Designsystem components",
"author": "NAV Designsystem team",
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@navikt/ds-react",
"version": "0.17.2",
"version": "0.17.3",
"private": false,
"description": "NAV designsystem react components",
"author": "NAV Designsystem team",
@@ -75,6 +75,7 @@ export interface SearchContextProps {
disabled?: boolean;
size: "medium" | "small";
variant?: "tertiary" | "primary";
onSearch?: () => void;
}
export const SearchContext = React.createContext<SearchContextProps | null>(
@@ -104,7 +105,7 @@ const Search = forwardRef<HTMLInputElement, SearchProps>((props, ref) => {
const searchRef = useRef<HTMLInputElement | null>(null);
const mergedRef = mergeRefs([searchRef, ref]);
const [wrapperRef, setWrapperRef] = useState<HTMLFormElement | null>(null);
const [wrapperRef, setWrapperRef] = useState<HTMLDivElement | null>(null);
const [controlledValue, setControlledValue] = useState(value ?? "");
@@ -147,8 +148,7 @@ const Search = forwardRef<HTMLInputElement, SearchProps>((props, ref) => {
}, [value]);
return (
<form
role="search"
<div
ref={setWrapperRef}
className={cl(
className,
@@ -159,10 +159,6 @@ const Search = forwardRef<HTMLInputElement, SearchProps>((props, ref) => {
"navds-search--disabled": !!inputProps.disabled,
}
)}
onSubmit={(e) => {
e.preventDefault();
onSearch?.(controlledValue);
}}
>
<Label
htmlFor={inputProps.id}
@@ -222,12 +218,13 @@ const Search = forwardRef<HTMLInputElement, SearchProps>((props, ref) => {
size,
disabled: inputProps.disabled,
variant,
onSearch: () => onSearch?.(controlledValue),
}}
>
{children ? children : <SearchButton />}
</SearchContext.Provider>
</div>
</form>
</div>
);
}) as SearchComponent;
@@ -25,7 +25,7 @@ const SearchButton: SearchButtonType = forwardRef(
return null;
}
const { size, variant } = context;
const { size, variant, onSearch } = context;
return (
<Button
@@ -36,7 +36,10 @@ const SearchButton: SearchButtonType = forwardRef(
variant={variant}
className={cl("navds-search__button-search", className)}
disabled={context?.disabled ?? disabled}
onClick={(e) => onClick?.(e)}
onClick={(e) => {
onSearch?.();
onClick?.(e);
}}
>
<Search aria-hidden />
{children ? children : <span className="navds-sr-only">Søk</span>}
+2 -2
View File
@@ -1,6 +1,6 @@
{
"name": "@navikt/ds-react-internal",
"version": "0.12.2",
"version": "0.12.3",
"private": false,
"description": "NAV internal designsystem react components",
"author": "NAV Designsystem team",
@@ -34,7 +34,7 @@
},
"dependencies": {
"@navikt/ds-icons": "^0.8.4",
"@navikt/ds-react": "^0.17.2",
"@navikt/ds-react": "^0.17.3",
"@popperjs/core": "^2.10.1",
"classnames": "^2.3.1",
"copy-to-clipboard": "^3.3.1",