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.

Sign up for GitHub

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

Jump to bottom

new icons and colors #161

Merged
merged 4 commits into from
Jan 8, 2024
Merged

new icons and colors #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0a1450b
Update Calendar icon in DateInput component
iacopolea Jan 8, 2024
4d62166
Add color to calendar and password icons
iacopolea Jan 8, 2024
4b07e99
Add isInvalid prop to DateInput component
iacopolea Jan 8, 2024
7b41b13
fix(datepicker): Add isInvalid prop to DatepickerProps
iacopolea Jan 8, 2024
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
9 changes: 6 additions & 3 deletions src/stories/DateInput/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ import {
localeIt,
} from "@appquality/mobiscroll";
import { ChangeEventHandler, useState } from "react";
import { Calendar } from "react-bootstrap-icons";
import { CalendarEventFill as CalendarIcon } from "react-bootstrap-icons";
import styled from "styled-components";
import { Button } from "../button/Button";
import { StyledInput as FormInput } from "../form/input/Input";
import { aqBootstrapTheme } from "../theme/defaultTheme";

const StyledInput = styled(FormInput)`
.mbsc-appquality.mbsc-textfield {
Expand All @@ -23,6 +24,7 @@ export interface DatepickerProps {
id: string;
name?: string;
value?: string;
isInvalid?: boolean;
minDate?: Date;
maxDate?: Date;
onOpen?: () => void;
Expand Down Expand Up @@ -51,6 +53,7 @@ export const DateInput = ({
onCancel,
controls = ["date"],
inputProps,
isInvalid,
i18n: {
locale = "en",
placeholder,
Expand Down Expand Up @@ -86,7 +89,7 @@ export const DateInput = ({
onChange && onChange(e);
};
return (
<StyledInput type="text">
<StyledInput type="text" isInvalid={isInvalid}>
<input
id={id}
name={name}
Expand Down Expand Up @@ -130,7 +133,7 @@ export const DateInput = ({
kind="transparent"
onClick={show}
>
<Calendar />
<CalendarIcon color={aqBootstrapTheme.variants.primary} />
</Button>
</span>
</StyledInput>
Expand Down
5 changes: 3 additions & 2 deletions src/stories/form/input/inputIcons/PasswordIcon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { EyeFill, EyeSlash } from "react-bootstrap-icons";
import { Button } from "../../../button/Button";
import { aqBootstrapTheme } from "../../../theme/defaultTheme";

const PasswordIcon = ({
type,
Expand All @@ -25,7 +26,7 @@ const PasswordIcon = ({
kind="transparent"
onClick={() => setType("password")}
>
<EyeSlash />
<EyeSlash color={aqBootstrapTheme.variants.primary} />
</Button>
) : (
<Button
Expand All @@ -37,7 +38,7 @@ const PasswordIcon = ({
kind="transparent"
onClick={() => setType("text")}
>
<EyeFill />
<EyeFill color={aqBootstrapTheme.variants.primary} />
</Button>
)}
</span>
Expand Down
Loading