From f300850b19f8b4084bfac88a4cfd06e43bc75a8e Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 6 Apr 2022 12:20:00 -0300 Subject: cta stories and input filled mui --- .../src/mui/TextField.stories.tsx | 2 +- .../src/mui/TextField.tsx | 2 +- .../src/mui/input/FormControl.tsx | 4 +- .../src/mui/input/InputBase.tsx | 3 +- .../src/mui/input/InputFilled.tsx | 169 ++++++++++++++++++++- .../src/mui/input/InputStandard.tsx | 5 +- .../taler-wallet-webextension/src/mui/style.tsx | 1 + 7 files changed, 178 insertions(+), 8 deletions(-) (limited to 'packages/taler-wallet-webextension/src/mui') diff --git a/packages/taler-wallet-webextension/src/mui/TextField.stories.tsx b/packages/taler-wallet-webextension/src/mui/TextField.stories.tsx index 85550aabf..e46b7f46f 100644 --- a/packages/taler-wallet-webextension/src/mui/TextField.stories.tsx +++ b/packages/taler-wallet-webextension/src/mui/TextField.stories.tsx @@ -33,7 +33,7 @@ const Container = styled.div` display: flex; flex-direction: column; & > * { - margin: 20px; + margin-bottom: 20px !important; } `; diff --git a/packages/taler-wallet-webextension/src/mui/TextField.tsx b/packages/taler-wallet-webextension/src/mui/TextField.tsx index c79c21ced..1987e9f6b 100644 --- a/packages/taler-wallet-webextension/src/mui/TextField.tsx +++ b/packages/taler-wallet-webextension/src/mui/TextField.tsx @@ -54,7 +54,7 @@ export function TextField({ select, helperText, children, - variant = "standard", + variant = "filled", ...props }: Props): VNode { // htmlFor={id} id={inputLabelId} diff --git a/packages/taler-wallet-webextension/src/mui/input/FormControl.tsx b/packages/taler-wallet-webextension/src/mui/input/FormControl.tsx index 0f73f8c02..ef08e97b6 100644 --- a/packages/taler-wallet-webextension/src/mui/input/FormControl.tsx +++ b/packages/taler-wallet-webextension/src/mui/input/FormControl.tsx @@ -56,7 +56,7 @@ export function FormControl({ margin = "none", required = false, size = "medium", - variant = "standard", + variant = "filled", children, }: Partial): VNode { const [filled, setFilled] = useState(false); @@ -138,7 +138,7 @@ const defaultContextValue: FCCProps = { onFilled: () => null, onFocus: () => null, required: false, - variant: "outlined", + variant: "filled", }; function withoutUndefinedProperties(obj: any): any { diff --git a/packages/taler-wallet-webextension/src/mui/input/InputBase.tsx b/packages/taler-wallet-webextension/src/mui/input/InputBase.tsx index a71f11c5e..5284cdad5 100644 --- a/packages/taler-wallet-webextension/src/mui/input/InputBase.tsx +++ b/packages/taler-wallet-webextension/src/mui/input/InputBase.tsx @@ -61,7 +61,6 @@ const componentStyle = css` font: inherit; letter-spacing: inherit; color: currentColor; - padding: 4px 0 5px; border: 0px; box-sizing: content-box; background: none; @@ -128,6 +127,7 @@ export function InputBaseComponent({ size, multiline, type, + class: _class, ...props }: any): VNode { return ( @@ -136,6 +136,7 @@ export function InputBaseComponent({ type={type} class={[ componentStyle, + _class, disabled && componentDisabledStyle, size === "small" && componentSmallStyle, multiline && componentMultilineStyle, diff --git a/packages/taler-wallet-webextension/src/mui/input/InputFilled.tsx b/packages/taler-wallet-webextension/src/mui/input/InputFilled.tsx index 5c50a8b72..8d837980b 100644 --- a/packages/taler-wallet-webextension/src/mui/input/InputFilled.tsx +++ b/packages/taler-wallet-webextension/src/mui/input/InputFilled.tsx @@ -1,5 +1,170 @@ +import { css } from "@linaria/core"; import { h, VNode } from "preact"; +// eslint-disable-next-line import/extensions +import { Colors, theme } from "../style"; +import { useFormControl } from "./FormControl.js"; +import { InputBase, InputBaseComponent, InputBaseRoot } from "./InputBase.js"; -export function InputFilled(): VNode { - return
; +export interface Props { + autoComplete?: string; + autoFocus?: boolean; + color?: Colors; + defaultValue?: string; + disabled?: boolean; + disableUnderline?: boolean; + endAdornment?: VNode; + error?: boolean; + fullWidth?: boolean; + id?: string; + margin?: "dense" | "normal" | "none"; + maxRows?: number; + minRows?: number; + multiline?: boolean; + name?: string; + onChange?: (s: string) => void; + placeholder?: string; + readOnly?: boolean; + required?: boolean; + rows?: number; + startAdornment?: VNode; + type?: string; + value?: string; +} +export function InputFilled({ + type = "text", + multiline, + ...props +}: Props): VNode { + const fcs = useFormControl(props); + return ( + + ); +} + +const light = theme.palette.mode === "light"; +const bottomLineColor = light + ? "rgba(0, 0, 0, 0.42)" + : "rgba(255, 255, 255, 0.7)"; +const backgroundColor = light + ? "rgba(0, 0, 0, 0.06)" + : "rgba(255, 255, 255, 0.09)"; +const backgroundColorHover = light + ? "rgba(0, 0, 0, 0.09)" + : "rgba(255, 255, 255, 0.13)"; +const backgroundColorDisabled = light + ? "rgba(0, 0, 0, 0.12)" + : "rgba(255, 255, 255, 0.12)"; + +const formControlStyle = css` + label + & { + margin-top: 16px; + } +`; + +const filledRootStyle = css` + position: relative; + background-color: ${backgroundColor}; + border-top-left-radius: ${theme.shape.borderRadius}px; + border-top-right-radius: ${theme.shape.borderRadius}px; + transition: ${theme.transitions.create("background-color", { + duration: theme.transitions.duration.shorter, + easing: theme.transitions.easing.easeOut, + })}; + // when is not disabled underline + &:hover { + background-color: ${backgroundColorHover}; + @media (hover: none) { + background-color: ${backgroundColor}; + } + } + [data-focused] { + background-color: ${backgroundColor}; + } + [data-disabled] { + background-color: ${backgroundColorDisabled}; + } +`; + +const underlineStyle = css` + // when is not disabled underline + &:after { + border-bottom: 2px solid var(--color-main); + left: 0px; + bottom: 0px; + content: ""; + position: absolute; + right: 0px; + transform: scaleX(0); + transition: ${theme.transitions.create("transform", { + duration: theme.transitions.duration.shorter, + easing: theme.transitions.easing.easeOut, + })}; + pointer-events: none; + } + &[data-focused]:after { + transform: scaleX(1); + } + &[data-error]:after { + border-bottom-color: ${theme.palette.error.main}; + transform: scaleY(1); + } + &:before { + border-bottom: 1px solid + ${theme.palette.mode === "light" + ? "rgba(0, 0, 0, 0.42)" + : "rgba(255, 255, 255, 0.7)"}; + left: 0px; + bottom: 0px; + right: 0px; + content: "\\00a0"; + position: absolute; + transition: ${theme.transitions.create("border-bottom-color", { + duration: theme.transitions.duration.shorter, + })}; + pointer-events: none; + } + &:hover:not([data-disabled]:before) { + border-bottom: 2px solid var(--color-main); + @media (hover: none) { + border-bottom: 1px solid + ${theme.palette.mode === "light" + ? "rgba(0, 0, 0, 0.42)" + : "rgba(255, 255, 255, 0.7)"}; + } + } + &[data-disabled]:before { + border-bottom-style: solid; + } +`; + +function Root({ fullWidth, disabled, focused, error, children }: any): VNode { + return ( + + {children} + + ); +} + +const filledBaseStyle = css` + padding-top: 25px; + padding-right: 12px; + padding-bottom: 8px; + padding-left: 12px; +`; + +function Input(props: any): VNode { + return ; } diff --git a/packages/taler-wallet-webextension/src/mui/input/InputStandard.tsx b/packages/taler-wallet-webextension/src/mui/input/InputStandard.tsx index 3eacd7984..bca6b0e80 100644 --- a/packages/taler-wallet-webextension/src/mui/input/InputStandard.tsx +++ b/packages/taler-wallet-webextension/src/mui/input/InputStandard.tsx @@ -50,6 +50,7 @@ export function InputStandard({ const rootStyle = css` position: relative; + padding: 4px 0 5px; `; const formControlStyle = css` label + & { @@ -57,6 +58,7 @@ const formControlStyle = css` } `; const underlineStyle = css` + // when is not disabled underline &:after { border-bottom: 2px solid var(--color-main); left: 0px; @@ -107,11 +109,12 @@ const underlineStyle = css` } `; -function Root({ disabled, focused, error, children }: any): VNode { +function Root({ fullWidth, disabled, focused, error, children }: any): VNode { return ( diff --git a/packages/taler-wallet-webextension/src/mui/style.tsx b/packages/taler-wallet-webextension/src/mui/style.tsx index 652a71d46..3ad1ab14e 100644 --- a/packages/taler-wallet-webextension/src/mui/style.tsx +++ b/packages/taler-wallet-webextension/src/mui/style.tsx @@ -147,6 +147,7 @@ function createTheme() { circularBorder: css` border-radius: 50%; `, + borderRadius: 4, }; ///////////////////// -- cgit v1.2.3