Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Redesign NavBarSearchField #612

Merged
merged 2 commits into from
Oct 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
--swui-textinput-font-family: var(--swui-font-input);
--swui-textinput-font-weight: var(--swui-font-weight-inputs);
--swui-textinput-placeholder-color: var(--swui-field-placeholder-color);
--swui-textinput-placeholder-font-weight: var(
--swui-field-placeholder-font-weight
);
--swui-textinput-animation-time: var(--swui-animation-time-medium);
--swui-textinput-icon-color: var(--swui-field-icon-color);
--swui-textinput-icon-hover-color: var(--swui-primary-action-color);
Expand Down Expand Up @@ -85,6 +88,11 @@

&::placeholder {
color: var(--swui-textinput-placeholder-color);
font-weight: var(--swui-textinput-placeholder-font-weight);
}

&:focus::placeholder {
opacity: 0;
}

&:focus {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ export default {
},
};

export const Demo: Story<TextInputProps> = (props) => <TextInput {...props} />;
export const Demo: Story<TextInputProps> = (props) => (
<TextInput {...props} placeholder={"Enter some text"} />
);

export const Overview = () => (
<Box width={"400px"}>
Expand Down
9 changes: 0 additions & 9 deletions packages/panels/src/components/nav-bar/NavBar.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ import { faAngleDoubleLeft } from "@fortawesome/free-solid-svg-icons/faAngleDoub
import { faThumbtack } from "@fortawesome/free-solid-svg-icons/faThumbtack";
import { NavBarUserButton } from "./NavBarUserButton";
import { NavBarNotificationButton } from "./NavBarNotificationButton";
import { NavBarSearchField } from "./NavBarSearchField";

export default {
title: "panels/NavBar",
Expand Down Expand Up @@ -220,14 +219,6 @@ export const WithButtonIcons = () => (
</Column>
);

export const CenterContent = () => (
<NavBar center={<NavBarSearchField />}>
<NavBarButton label={"Customers"} selected />
<NavBarButton label={"Bookings"} />
<NavBarButton label={"Events"} />
</NavBar>
);

export const PopoverButton = () => (
<NavBar
right={
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
.navBarSearchFieldInput {
.navBarSearchFieldInput.navBarSearchFieldInput {
--swui-textinput-line-height: 2.7rem;
--swui-textinput-text-color: var(--lhds-color-ui-50);
--swui-textinput-placeholder-color: var(--lhds-color-blue-800);

padding: 1px var(--swui-metrics-indent);

&:focus {
--swui-textinput-text-color: var(--lhds-color-ui-800);
Expand All @@ -11,14 +14,17 @@
--swui-textinput-animation-time: var(--swui-animation-time-fast);

--swui-textinput-placeholder-color: var(--lhds-color-ui-500);
--swui-textinput-bg-color: var(--lhds-color-blue-50);
--swui-textinput-bg-color: var(--lhds-color-ui-200);
--swui-textinput-border-color: transparent;
--swui-textinput-border-color-hover: transparent;

padding: 1px var(--swui-metrics-indent) 0;

border-radius: var(--swui-max-border-radius);

&:focus-within {
--swui-textinput-text-color: var(--lhds-color-ui-800);
--swui-field-text-color: var(--swui-field-text-color);
--swui-textinput-icon-color: var(--lhds-color-ui-500);
--swui-textinput-bg-color: var(--lhds-color-ui-50);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import * as React from "react";
import { NavBar } from "./NavBar";
import { NavBarButton } from "./NavBarButton";
import { NavBarSearchField } from "./NavBarSearchField";

export default {
title: "panels/NavBar/NavBarSearchField",
component: NavBarSearchField,
parameters: {
layout: "fullscreen",
},
};

export const CenterContent = () => (
<NavBar center={<NavBarSearchField />}>
<NavBarButton label={"Customers"} selected />
<NavBarButton label={"Bookings"} />
</NavBar>
);
9 changes: 1 addition & 8 deletions packages/panels/src/components/nav-bar/NavBarSearchField.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
import * as React from "react";
import { TextInput, TextInputProps } from "@stenajs-webui/forms";
import { Clickable } from "@stenajs-webui/core";
import { Icon, stenaSearch } from "@stenajs-webui/elements";
import cx from "classnames";
import styles from "./NavBarSearchField.module.css";

interface NavBarSearchFieldProps extends TextInputProps {}

export const NavBarSearchField: React.FC<NavBarSearchFieldProps> = ({
placeholder = "Search...",
placeholder = "Search",
className,
wrapperClassName,
...textInputProps
Expand All @@ -18,11 +16,6 @@ export const NavBarSearchField: React.FC<NavBarSearchFieldProps> = ({
wrapperClassName={cx(styles.navBarSearchField, wrapperClassName)}
className={cx(styles.navBarSearchFieldInput, className)}
placeholder={placeholder}
contentRight={
<Clickable>
<Icon icon={stenaSearch} />
</Clickable>
}
{...textInputProps}
/>
);
Expand Down
1 change: 1 addition & 0 deletions packages/theme/src/styles/default-theme.css
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
--swui-field-indicator-active-color: var(--swui-white);
--swui-field-indicator-inactive-color: var(--swui-hidden);
--swui-field-placeholder-color: var(--lhds-color-ui-500);
--swui-field-placeholder-font-weight: var(--swui-font-weight-text-bold);

/* Borders */
--swui-border-radius: 8px;
Expand Down
Loading