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

feat: Add inverted variant to Tipseen and Steps #1995

Merged
merged 9 commits into from
Mar 13, 2024
Merged

feat: Add inverted variant to Tipseen and Steps #1995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5e5da5d
feat: Add inverted variant to Tipseen and Steps
shaharzil Mar 5, 2024
be324f7
fixed lint
shaharzil Mar 5, 2024
84f11c5
Update packages/core/src/components/Tipseen/TipseenBasicContent.modul…
shaharzil Mar 6, 2024
8221549
changed width back to 320
shaharzil Mar 11, 2024
eaa1755
changed story width and added disabled
shaharzil Mar 11, 2024
2fc52ba
fixed disbaled primary
shaharzil Mar 11, 2024
cad1d01
fixed stories tests
shaharzil Mar 11, 2024
012414c
fixed primary bitton selector
shaharzil Mar 11, 2024
d545f8e
Merge branch 'master' into add-new-tipseen-variant
shaharzil Mar 13, 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
42 changes: 41 additions & 1 deletion packages/core/src/components/Button/Button.module.scss
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to nest this stylesheet sometime, it would be easier to read and understand

Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,23 @@ $disabled-on-primary-color-opacity: 0.5;
color: var(--fixed-light-color);
}

.kindPrimary.colorOnInvertedBackground {
background: var(--primary-background-color);
color: var(--primary-text-color);
}

.kindPrimary.colorOnInvertedBackgroundActive,
.kindPrimary.colorOnInvertedBackground:hover,
.kindPrimary.colorOnInvertedBackground:focus {
background: var(--ui-background-color);
}

.kindPrimary.button.colorOnInvertedBackground.disabled {
background: var(--ui-background-color);
color: var(--primary-text-color);
opacity: $disabled-on-primary-color-opacity;
}

.kindPrimary.button.disabled {
background: var(--disabled-background-color);
color: var(--disabled-text-color);
Expand Down Expand Up @@ -341,6 +358,23 @@ $disabled-on-primary-color-opacity: 0.5;
@include focus-style-on-primary();
}

.kindSecondary.colorOnInvertedBackground {
border-color: var(--text-color-on-inverted);
color: var(--text-color-on-inverted);
}

.kindSecondary.colorOnInvertedBackgroundActive,
.kindSecondary.colorOnInvertedBackground:hover,
.kindSecondary.colorOnInvertedBackground:focus {
background: var(--icon-color);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

non-semantic color warning

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know, it is the same issue that I talked with you about it yesterday, we don't have semantic colors for the inverted colors :(

}

.kindSecondary.colorOnInvertedBackground.disabled {
border-color: var(--text-color-on-inverted);
color: var(--text-color-on-inverted);
opacity: $disabled-on-primary-color-opacity;
}

.kindSecondary.colorFixedLight.disabled {
opacity: $disabled-on-primary-color-opacity;
color: var(--fixed-light-color);
Expand Down Expand Up @@ -459,7 +493,13 @@ $disabled-on-primary-color-opacity: 0.5;
.kindTertiary.colorOnInvertedBackgroundActive,
.kindTertiary.colorOnInvertedBackground:hover,
.kindTertiary.colorOnInvertedBackground:focus {
backdrop-filter: brightness(85%);
background: var(--icon-color);
}

.kindTertiary.colorOnInvertedBackground.disabled {
background: var(--icon-color);
opacity: $disabled-on-primary-color-opacity;
color: var(--text-color-on-inverted);
}

.kindTertiary.disabled {
Expand Down
15 changes: 13 additions & 2 deletions packages/core/src/components/Steps/Steps.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ import cx from "classnames";
import { NOOP } from "../../utils/function-utils";
import useMergeRef from "../../hooks/useMergeRef";
import { StepsHeader } from "./StepsHeader";
import { StepsType } from "./StepsConstants";
import { StepsColor, StepsType } from "./StepsConstants";
import { ButtonProps } from "../Button/Button";
import { ComponentDefaultTestId, getTestId } from "../../tests/test-ids-utils";
import { withStaticProps, VibeComponent, VibeComponentProps } from "../../types";
import styles from "./Steps.module.scss";
import { backwardCompatibilityForProperties } from "../../helpers/backwardCompatibilityForProperties";

export interface StepsProps extends VibeComponentProps {
/**
Expand All @@ -21,7 +22,11 @@ export interface StepsProps extends VibeComponentProps {
areNavigationButtonsHidden?: boolean;
steps?: ReactElement[];
type?: StepsType;
/**
* @deprecated - Use color instead
*/
isOnPrimary?: boolean;
color?: StepsColor;
isContentOnTop?: boolean;
areButtonsIconsHidden?: boolean;
backButtonProps?: ButtonProps;
Expand All @@ -41,7 +46,9 @@ const Steps: VibeComponent<StepsProps> & { types?: typeof StepsType } = forwardR
type = StepsType.GALLERY,
onChangeActiveStep = NOOP,
onFinish,
// TODO Remove in next major as breaking change
isOnPrimary = false,
color,
areNavigationButtonsHidden = false,
isContentOnTop = false,
backButtonProps = {},
Expand All @@ -53,6 +60,10 @@ const Steps: VibeComponent<StepsProps> & { types?: typeof StepsType } = forwardR
) => {
const componentRef = useRef(null);
const mergedRef = useMergeRef(ref, componentRef);
const overrideColor = backwardCompatibilityForProperties([
color,
isOnPrimary ? StepsColor.ON_PRIMARY_COLOR : undefined
]);
return (
<div
ref={mergedRef}
Expand All @@ -67,7 +78,7 @@ const Steps: VibeComponent<StepsProps> & { types?: typeof StepsType } = forwardR
activeStepIndex={activeStepIndex}
stepsCount={steps.length}
areNavigationButtonsHidden={areNavigationButtonsHidden}
isOnPrimary={isOnPrimary}
color={overrideColor}
backButtonProps={backButtonProps}
nextButtonProps={nextButtonProps}
finishButtonProps={finishButtonProps}
Expand Down
6 changes: 5 additions & 1 deletion packages/core/src/components/Steps/StepsCommand.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@
&.disabled {
color: var(--disabled-text-color);
}
&.onPrimary {
&.colorOnPrimaryColor {
color: var(--text-color-on-primary);
}
&.colorOnInvertedBackground {
color: var(--text-color-on-inverted);
}
}

19 changes: 10 additions & 9 deletions packages/core/src/components/Steps/StepsCommand.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@ import NavigationChevronLeft from "../../components/Icon/Icons/components/Naviga
import Icon from "../../components/Icon/Icon";
import Button, { ButtonProps } from "../../components/Button/Button";
import { NOOP } from "../../utils/function-utils";
import { BACK_TEXT, NEXT_TEXT } from "./StepsConstants";
import { BACK_TEXT, NEXT_TEXT, StepsColor } from "./StepsConstants";
import VibeComponentProps from "../../types/VibeComponentProps";
import { ComponentDefaultTestId } from "../../tests/constants";
import styles from "./StepsCommand.module.scss";
import { camelCase } from "lodash-es";
import { getStyle } from "../..//helpers/typesciptCssModulesHelper";

export interface StepsCommandProps extends VibeComponentProps {
isNext?: boolean;
Expand All @@ -17,7 +19,7 @@ export interface StepsCommandProps extends VibeComponentProps {
stepsCount: number;
isIconHidden?: boolean;
buttonProps?: ButtonProps;
isOnPrimary?: boolean;
color?: StepsColor;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't it breaking?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In principle, all these components should not be used by themselves, they are the children of the Steps component where I did not break the api

}

export const StepsCommand: FC<StepsCommandProps> = ({
Expand All @@ -26,15 +28,14 @@ export const StepsCommand: FC<StepsCommandProps> = ({
activeStepIndex,
stepsCount,
isIconHidden = false,
isOnPrimary = false,
buttonProps = {}
buttonProps = {},
color = StepsColor.PRIMARY
}) => {
const { children: buttonChildren, ...otherButtonProps } = buttonProps;
const description = useMemo(() => {
if (buttonChildren) return buttonChildren;
return isNext ? NEXT_TEXT : BACK_TEXT;
}, [isNext, buttonChildren]);
const buttonBaseColor = isOnPrimary ? Button.colors.ON_PRIMARY_COLOR : undefined;
const newStepIndex = isNext ? activeStepIndex + 1 : activeStepIndex - 1;
const onClick = useCallback(
(e: React.MouseEvent) => onChangeActiveStep(e, newStepIndex),
Expand All @@ -52,17 +53,17 @@ export const StepsCommand: FC<StepsCommandProps> = ({
kind={Button.kinds.TERTIARY}
onClick={onClick}
disabled={isDisabled}
color={buttonBaseColor}
// @ts-ignore
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why ignore here?

color={color}
{...otherButtonProps}
>
{description}
{isIconHidden ? null : (
<Icon
icon={icon}
clickable={false}
className={cx(styles.icon, {
[styles.disabled]: isDisabled,
[styles.onPrimary]: isOnPrimary
className={cx(styles.icon, getStyle(styles, camelCase("color-" + color)), {
[styles.disabled]: isDisabled
})}
/>
)}
Expand Down
6 changes: 6 additions & 0 deletions packages/core/src/components/Steps/StepsConstants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,9 @@ export enum StepsDotAriaCurrent {
DATE = "date",
TIME = "time"
}

export enum StepsColor {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it possible that we use TS types here instead of enums? Less for the migration

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure! I forgot we talked about it, I'll change it in all the files I touched

PRIMARY = "primary",
ON_PRIMARY_COLOR = "on-primary-color",
ON_INVERTED_BACKGROUND = "on-inverted-background"
}
12 changes: 10 additions & 2 deletions packages/core/src/components/Steps/StepsDot.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,19 @@
@include active-step-dot;
}

.onPrimary.dot {
.colorOnPrimaryColor.dot {
background: var(--primary-hover-color);
@include focus-style-on-primary;
}

.onPrimary.isActive {
.colorOnPrimaryColor.dot.isActive {
background: var(--text-color-on-primary);
}

.colorOnInvertedBackground.dot {
background: var(--placeholder-color);
}

.colorOnInvertedBackground.dot.isActive {
background: var(--text-color-on-inverted);
}
13 changes: 7 additions & 6 deletions packages/core/src/components/Steps/StepsDot.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
import cx from "classnames";
import { noop as NOOP } from "lodash-es";
import { StepsDotAriaCurrent } from "./StepsConstants";
import { noop as NOOP, camelCase } from "lodash-es";
import { StepsColor, StepsDotAriaCurrent } from "./StepsConstants";
import VibeComponentProps from "../../types/VibeComponentProps";
import React, { FC } from "react";
import styles from "./StepsDot.module.scss";
import { getStyle } from "../../helpers/typesciptCssModulesHelper";

export interface StepsDotProps extends VibeComponentProps {
onClick?: (e: React.MouseEvent) => void;
ariaCurrent?: StepsDotAriaCurrent | boolean;
isActive?: boolean;
ariaLabel?: string;
isOnPrimary?: boolean;
color?: StepsColor;
talkor marked this conversation as resolved.
Show resolved Hide resolved
}

export const StepsDot: FC<StepsDotProps> = ({
isActive,
onClick = NOOP,
ariaCurrent = StepsDotAriaCurrent.STEP,
ariaLabel,
isOnPrimary,
color,
className
}) => {
return (
Expand All @@ -28,9 +29,9 @@ export const StepsDot: FC<StepsDotProps> = ({
aria-current={isActive ? ariaCurrent : false}
className={cx(
styles.dot,
getStyle(styles, camelCase("color-" + color)),
{
[styles.isActive]: isActive,
[styles.onPrimary]: isOnPrimary
[styles.isActive]: isActive
},
className
)}
Expand Down
9 changes: 5 additions & 4 deletions packages/core/src/components/Steps/StepsGalleryHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,22 @@ import { range } from "lodash-es";
import { StepsDot } from "./StepsDot";
import VibeComponentProps from "../../types/VibeComponentProps";
import styles from "./StepsGalleryHeader.module.scss";
import { StepsColor } from "./StepsConstants";

export interface StepsGalleryHeaderProps extends VibeComponentProps {
activeStepIndex: number;
stepsCount: number;
onChangeActiveStep: (e: React.MouseEvent, stepIndex: number) => void;
stepDescriptionFunc: (stepIndex: number) => string;
isOnPrimary?: boolean;
color?: StepsColor;
talkor marked this conversation as resolved.
Show resolved Hide resolved
}

export const StepsGalleryHeader: FC<StepsGalleryHeaderProps> = ({
activeStepIndex,
stepsCount,
onChangeActiveStep,
stepDescriptionFunc,
isOnPrimary
color
}) => {
const stepsPlaceholders = useMemo(() => range(stepsCount), [stepsCount]);
const defaultStepDescriptionFunc = useCallback((stepIndex: number) => `Step number ${stepIndex}`, []);
Expand All @@ -36,13 +37,13 @@ export const StepsGalleryHeader: FC<StepsGalleryHeaderProps> = ({
key={`monday-style-step-dot-${stepIndex + 1}`}
ariaLabel={overrideStepDescriptionFunc(stepIndex)}
onClick={onClickFunctions[stepIndex]}
isOnPrimary={isOnPrimary}
color={color}
className={styles.galleryHeaderDot}
/>
),
[]
),
[activeStepIndex, isOnPrimary, onClickFunctions, overrideStepDescriptionFunc, stepsPlaceholders]
[activeStepIndex, color, onClickFunctions, overrideStepDescriptionFunc, stepsPlaceholders]
);

return (
Expand Down
19 changes: 8 additions & 11 deletions packages/core/src/components/Steps/StepsHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import cx from "classnames";
import { StepsCommand } from "./StepsCommand";
import { StepsGalleryHeader, StepsGalleryHeaderProps } from "./StepsGalleryHeader";
import { StepsNumbersHeader, StepsNumbersHeaderProps } from "./StepsNumbersHeader";
import { StepsType, FINISH_TEXT } from "./StepsConstants";
import { StepsType, FINISH_TEXT, StepsColor } from "./StepsConstants";
import VibeComponentProps from "../../types/VibeComponentProps";
import Button, { ButtonProps } from "../Button/Button";
import styles from "./StepsHeader.module.scss";
Expand All @@ -18,7 +18,7 @@ export interface StepsHeaderProps extends VibeComponentProps {
nextButtonProps: ButtonProps;
finishButtonProps: ButtonProps;
areButtonsIconsHidden: boolean;
isOnPrimary: boolean;
color?: StepsColor;
onFinish?: (e: React.MouseEvent) => void;
}

Expand All @@ -32,7 +32,7 @@ export const StepsHeader: FC<StepsHeaderProps> = ({
nextButtonProps,
finishButtonProps,
areButtonsIconsHidden,
isOnPrimary,
color = StepsColor.PRIMARY,
onFinish,
className
}) => {
Expand All @@ -57,23 +57,20 @@ export const StepsHeader: FC<StepsHeaderProps> = ({
activeStepIndex={activeStepIndex}
stepsCount={stepsCount}
buttonProps={backButtonProps}
isOnPrimary={isOnPrimary}
color={color}
/>
)}
<SubHeaderComponent
activeStepIndex={activeStepIndex}
stepsCount={stepsCount}
onChangeActiveStep={onChangeActiveStep}
isOnPrimary={isOnPrimary}
color={color}
/>
{areNavigationButtonsHidden ? null : (
<>
{showFinishButton ? (
<Button
onClick={onFinish}
color={isOnPrimary ? Button.colors.ON_PRIMARY_COLOR : undefined}
{...finishButtonProps}
>
// @ts-ignore
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why ignore?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

because color is type StepsColor and and ButtonColor

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do they have the same values? I wonder if we can do something about it

<Button onClick={onFinish} color={color} {...finishButtonProps}>
{finishButtonProps?.children || FINISH_TEXT}
</Button>
) : (
Expand All @@ -84,7 +81,7 @@ export const StepsHeader: FC<StepsHeaderProps> = ({
onChangeActiveStep={onChangeActiveStep}
stepsCount={stepsCount}
buttonProps={nextButtonProps}
isOnPrimary={isOnPrimary}
color={color}
/>
)}
</>
Expand Down
Loading