@orangesk/orange-design-system 2.0.0-beta.0 → 2.0.0-beta.10

package/src/components/CartTable/Price.tsx

@@ -22,7 +22,7 @@ const Price: React.FC<PriceProps> = ({
     <>
       {discount && price && (
         <>
-          <del className="color-gray">{formatPrice(price)}</del>
+          <del className="text-secondary">{formatPrice(price)}</del>
           <br />
         </>
       )}

package/src/components/Controls/styles/config.scss

@@ -22,8 +22,8 @@ $base: (
 $states: (
   default: (
     color: var(--color-text-default),
-    background-color: var(--color-fill-disabled),
-    border-color: var(--color-fill-disabled),
+    background-color: var(--color-fill-moderate),
+    border-color: var(--color-fill-moderate),
   ),
   hover: (
     color: var(--color-text-inverse),

package/src/components/Controls/tests/Controls.test.js

@@ -16,15 +16,6 @@ describe("Controls Component", () => {
       expect(button).toHaveClass("controls");
     });
 
-    it("should render with default styling classes", () => {
-      // Test that default CSS classes are applied correctly
-      render(<Controls icon="menu" />);
-
-      const button = screen.getByRole("button");
-      expect(button).toHaveClass("controls");
-      expect(button).not.toHaveClass("controls--inverse");
-    });
-
     it("should render with custom className", () => {
       // Test that custom CSS classes can be added
       render(<Controls icon="search" className="custom-class" />);

package/src/components/Cover/index.ts

@@ -1,3 +1,2 @@
-import { Cover } from './Cover';
-import './styles/style.scss';
+import { Cover } from "./Cover";
 export { Cover };

package/src/components/Divider/Divider.tsx

@@ -5,36 +5,22 @@ import { Icon } from "../Icon";
 
 export interface DividerProps
   extends Omit<HTMLAttributes<HTMLDivElement>, "content"> {
-  /** Custom background color */
-  color?: "black" | "white";
   /** Custom content inside divider */
   content?: ReactNode;
   /** Icon which will be rendered inside divider */
   icon?: string;
-  /** Divider line has width of 1px */
-  thinLine?: boolean;
 }
 
 const CLASS_ROOT = "divider";
 
 const Divider: React.FC<DividerProps> = ({
   className,
-  color,
   icon,
   content,
-  thinLine,
   ...other
 }) => {
-  const classes = cx(
-    CLASS_ROOT,
-    {
-      [`${CLASS_ROOT}--${color}`]: color,
-    },
-    className,
-  );
-  const lineClass = cx(`${CLASS_ROOT}__line`, {
-    [`${CLASS_ROOT}__line--thin`]: thinLine,
-  });
+  const classes = cx(CLASS_ROOT, className);
+  const lineClass = `${CLASS_ROOT}__line`;
   const contentClass = `${CLASS_ROOT}__content`;
 
   return (

package/src/components/Divider/styles/config.scss

@@ -1,26 +1,9 @@
-@use "../../../styles/tokens/color";
 @use "../../../styles/tokens/space";
 
 $base: (
   font-weight: bold,
 );
 
-$colors: (
-  "default": (
-    // TODO: Use color tokens instead of hardcoded values
-    content: color.$gray-700,
-    line: var(--color-border-subtle),
-  ),
-  "black": (
-    content: color.$black,
-    line: color.$black,
-  ),
-  "white": (
-    content: color.$white,
-    line: color.$white,
-  ),
-);
-
 $spacing: (
   default: space.get(),
   md: space.get("large"),

package/src/components/Divider/styles/mixins.scss

@@ -2,6 +2,7 @@
 @use "../../../styles/tools/generate";
 @use "../../../styles/tools/map";
 @use "../../../styles/tokens/breakpoint";
+@use "../../../styles/tokens/color";
 
 @mixin divider-base($base: config.$base) {
   display: flex;
@@ -14,7 +15,8 @@
 
   @each $breakpoint, $value in config.$spacing {
     @include breakpoint.get($breakpoint) {
-      padding: $value;
+      padding-top: $value;
+      padding-bottom: $value;
     }
   }
 }
@@ -26,20 +28,16 @@
   justify-content: center;
 }
 
-@mixin divider-content-color($color, $config: config.$colors) {
-  color: map.map-deep-get($config, $color, "content");
+@mixin divider-content-color() {
+  color: var(--color-text-secondary);
 }
 
 @mixin divider-line() {
-  border-width: 0 0 2px;
+  border-width: 0 0 1px;
   border-style: solid;
   flex-grow: 1;
 }
 
-@mixin divider-line-thin() {
-  border-width: 0 0 1px;
-}
-
-@mixin divider-line-color($color, $config: config.$colors) {
-  border-color: map.map-deep-get($config, $color, "line");
+@mixin divider-line-color() {
+  border-color: var(--color-border-strong);
 }

package/src/components/Divider/styles/style.scss

@@ -8,26 +8,12 @@
 
     &__content {
       @include mixins.divider-content;
-
-      @each $color, $values in config.$colors {
-        #{generate.variant-name($color, ".divider--")} & {
-          @include mixins.divider-content-color($color);
-        }
-      }
+      @include mixins.divider-content-color();
     }
 
     &__line {
       @include mixins.divider-line;
-
-      &--thin {
-        @include mixins.divider-line-thin;
-      }
-
-      @each $color, $values in config.$colors {
-        #{generate.variant-name($color, ".divider--")} & {
-          @include mixins.divider-line-color($color);
-        }
-      }
+      @include mixins.divider-line-color();
     }
   }
 }

package/src/components/Divider/tests/Divider.conformance.test.js

@@ -8,7 +8,7 @@ const example = (
     <Divider />
     <Divider content={<span>Hello node</span>} />
     <Divider content="Hello string" />
-    <Divider color="black" icon="add" />
+    <Divider icon="add" />
   </>
 );
 

package/src/components/Divider/tests/Divider.unit.test.js

@@ -22,23 +22,6 @@ describe("rendering Divider", () => {
       expect(getByTestId("test-id")).toHaveClass("divider");
       expect(getByTestId("test-id")).toHaveClass("test-class");
     });
-
-    it("child div has class divider__line--thin when thinLine is set to true", () => {
-      const { container } = render(<Divider thinLine={true} />);
-      expect(
-        container.getElementsByClassName("divider__line--thin").length,
-      ).toBe(1);
-    });
-
-    ["black", "white"].map((color) => {
-      it(`has divider--${color} class when color is set to ${color}`, () => {
-        const { getByTestId } = render(
-          <Divider color={color} data-testid="test-id" />,
-        );
-        expect(getByTestId("test-id")).toHaveClass("divider");
-        expect(getByTestId("test-id")).toHaveClass(`divider--${color}`);
-      });
-    });
     it("has class divider__content when content prop is set", () => {
       const { container } = render(<Divider content="test-content" />);
       expect(container.getElementsByClassName("divider__content").length).toBe(

package/src/components/Dropdown/styles/mixins.scss

@@ -66,7 +66,7 @@
   &[disabled],
   &[aria-disabled="true"] {
     pointer-events: none;
-    color: color.$gray-600;
+    color: var(--color-surface-moderate);
   }
 
   @each $prop, $value in sass-map.get($dropdown-menu-item, "default") {

package/src/components/Expander/Expander.tsx

@@ -26,8 +26,8 @@ interface ExpanderProps {
   className?: string;
   /** Child elements */
   children?: React.ReactNode;
-  /** Additional HTML attributes */
-  [key: string]: any;
+  /** Expander takes full width of its container */
+  isFullWidth?: boolean;
 }
 
 export const Expander: React.FC<ExpanderProps> = (props) => {
@@ -39,6 +39,7 @@ export const Expander: React.FC<ExpanderProps> = (props) => {
     renderSummary,
     renderSummaryOpened,
     colorScheme,
+    isFullWidth,
     ...other
   } = props;
   const [expanderRef] = useStatic(ExpanderStatic);
@@ -46,6 +47,7 @@ export const Expander: React.FC<ExpanderProps> = (props) => {
   const classes = cx(
     CLASS_ROOT,
     {
+      [`${CLASS_ROOT}--fullwidth`]: isFullWidth,
       "is-dark": colorScheme === "dark",
       "is-light": colorScheme === "light",
     },

package/src/components/Expander/styles/style.scss

@@ -41,6 +41,13 @@
       display: none;
     }
 
+    &--fullwidth {
+      .expander__summary {
+        width: 100%;
+        justify-content: space-between;
+      }
+    }
+
     &[open] {
       svg[data-summary-icon] {
         transform: rotate(180deg) !important;

package/src/components/Footer/Footer.tsx

@@ -1,90 +1,106 @@
 import React from "react";
 import cx from "classnames";
 
-import { Section } from "../Section";
-import { SectionProps } from "../Section/Section";
-import { Image } from "../Image";
-import { Grid, GridCol } from "../Grid";
-import { Link } from "../Link";
 import footerData from "./data";
-import { Bar, BarItem } from "../Bar";
+import {
+  CLASS_BOTTOM,
+  CLASS_BOTTOM_COPYRIGHT,
+  CLASS_CONTAINER,
+  CLASS_GRID,
+  CLASS_LIST,
+  CLASS_LIST_INLINE,
+  CLASS_LOGO,
+  CLASS_ROOT,
+  CLASS_TITLE,
+} from "./constants";
 
 interface FooterProps extends React.HTMLAttributes<HTMLDivElement> {
-  /** Sets Footer to use inverse color scheme */
-  isInverse?: boolean;
-  /** Custom data to override default footer data */
   data?: typeof footerData;
   className?: string;
 }
 
-const CLASS_ROOT = "footer";
-
-const Footer: React.FC<FooterProps & SectionProps> = ({
-  className,
-  isInverse,
-  data = footerData,
-  ...other
-}) => {
-  const classes = cx(
-    CLASS_ROOT,
-    {
-      [`${CLASS_ROOT}--inverse`]: isInverse,
-    },
-    className,
-  );
-
+const Footer: React.FC<FooterProps> = ({ className, data = footerData }) => {
   return (
-    <Section tag="footer" className={classes} {...other}>
-      <Image src="/logo.svg" alt="logo" className="mb-xlarge" />
-      <Grid rowGapSize="medium">
-        {data.columns.map((column, index) => (
-          <GridCol
-            size={{
-              lg: 3,
-              md: 4,
-              sm: 6,
-              xs: 12,
-            }}
-            key={`footer-column-${index}`}
+    <footer className={cx(CLASS_ROOT, className)}>
+      <div className={CLASS_CONTAINER}>
+        <a href="/" aria-label="Odkaz na úvodnú stránku" className={CLASS_LOGO}>
+          <svg
+            width="48"
+            height="48"
+            viewBox="0 0 48 48"
+            fill="none"
+            xmlns="http://www.w3.org/2000/svg"
           >
-            <h5 className="mb-large">{column.title}</h5>
-            <ul className="list-unstyled">
-              {column.links.map((link, linkIndex) => (
-                <li
-                  className="mb-small"
-                  key={`footer-link-${index}-${linkIndex}`}
-                >
-                  <Link className={`${CLASS_ROOT}__link`} href={link.url}>
-                    {link.label}
-                  </Link>
-                </li>
-              ))}
-            </ul>
-          </GridCol>
-        ))}
-      </Grid>
+            <path d="M48 0H0V48H48V0Z" fill="black" />
+            <path
+              fillRule="evenodd"
+              clipRule="evenodd"
+              d="M48 48H0V0H48V48Z"
+              fill="#FF7900"
+            />
+            <path
+              d="M5.9078 44.1298C4.1702 44.1298 2.60156 43.0229 2.60156 40.6047C2.60156 38.1855 4.16924 37.0796 5.9078 37.0796C7.6454 37.0796 9.21116 38.1865 9.21116 40.6047C9.21116 43.0229 7.64636 44.1298 5.9078 44.1298ZM5.9078 38.5657C4.59356 38.5657 4.35356 39.7494 4.35356 40.6047C4.35356 41.4591 4.59356 42.6457 5.9078 42.6457C7.22204 42.6457 7.46204 41.4601 7.46204 40.6047C7.46204 39.7503 7.22204 38.5657 5.9078 38.5657Z"
+              fill="white"
+            />
+            <path
+              fillRule="evenodd"
+              clipRule="evenodd"
+              d="M10.418 37.2559H12.0912V38.0412C12.41 37.6179 13.1952 37.1196 13.9316 37.1196C14.0016 37.1196 14.088 37.1196 14.16 37.1283V38.7795H14.0736C13.3095 38.7795 12.4733 38.8985 12.2026 39.4927V43.9356H10.418V37.2559Z"
+              fill="white"
+            />
+            <path
+              d="M18.831 43.3547C18.1777 43.7913 17.4087 44.0223 16.623 44.0181C15.375 44.0181 14.6367 43.1887 14.6367 42.0751C14.6367 40.5794 16.0114 39.7903 18.8444 39.4706V39.0981C18.8444 38.6133 18.4767 38.3291 17.7961 38.3291C17.1164 38.3291 16.5634 38.5989 16.165 39.0971L14.9794 38.4223C15.6015 37.5506 16.55 37.1147 17.8239 37.1147C19.5673 37.1147 20.5455 37.8703 20.5455 39.0981C20.5455 39.0981 20.5436 43.9269 20.5455 43.9394H18.9865L18.831 43.3547ZM16.3686 41.9474C16.3686 42.3967 16.6498 42.8162 17.1606 42.8162C17.7126 42.8162 18.2511 42.5877 18.7887 42.1125V40.5304C17.1471 40.733 16.3686 41.1573 16.3686 41.9474Z"
+              fill="white"
+            />
+            <path
+              fillRule="evenodd"
+              clipRule="evenodd"
+              d="M21.9336 37.4342L23.3899 37.2336L23.5512 38.0256C24.371 37.4246 25.0229 37.1059 25.8437 37.1059C27.2184 37.1059 27.9288 37.8355 27.9288 39.2793V43.9296H26.1691V39.5846C26.1691 38.7667 25.9579 38.399 25.3214 38.399C24.7973 38.399 24.2731 38.6361 23.6741 39.1392V43.9296H21.9336V37.4342Z"
+              fill="white"
+            />
+            <path
+              d="M32.2317 42.5003C33.5642 42.4907 33.6784 41.1323 33.6784 40.2491C33.6784 39.2008 33.1677 38.355 32.2192 38.355C31.5885 38.355 30.8819 38.8158 30.8819 40.3221C30.8819 41.1438 30.9405 42.5118 32.2317 42.5003ZM35.3671 37.2328V43.5582C35.3671 44.6718 35.2787 46.515 32.0983 46.5314C30.785 46.541 29.5658 46.013 29.3239 44.8677L31.0567 44.5874C31.1296 44.9166 31.3322 45.2421 32.3152 45.2421C33.2263 45.2421 33.664 44.8072 33.664 43.7637V42.9851L33.641 42.9611C33.3616 43.4622 32.9373 43.9355 31.9168 43.9355C30.3578 43.9355 29.1328 42.8546 29.1328 40.5966C29.1328 38.3627 30.3981 37.1118 31.817 37.109C33.1514 37.107 33.6429 37.7147 33.76 38.0334L33.736 38.0315L33.8829 37.2328H35.3671ZM39.5709 44.0584C37.6029 44.0584 36.4279 42.7912 36.4279 40.5928C36.4279 38.3704 37.6163 37.1051 39.5431 37.1051C41.4698 37.1051 42.616 38.3339 42.616 40.5045C42.616 40.6216 42.6016 40.7349 42.6016 40.8501H38.1539C38.1664 42.1173 38.6925 42.7557 39.7274 42.7557C40.3907 42.7557 40.8314 42.4869 41.2442 41.9003L42.5306 42.6136C41.9642 43.5611 40.9427 44.0584 39.5709 44.0584ZM40.8899 39.7096C40.8899 38.8178 40.3773 38.2917 39.5431 38.2917C38.7482 38.2917 38.2519 38.8062 38.1827 39.7106L40.8899 39.7096ZM45.6256 34.7214L44.9776 36.3966L44.3191 34.7214H43.7546V36.9294H44.1203V35.0872H44.1299L44.8547 36.9304H45.088L45.808 35.0872H45.8195V36.9304H46.1824V34.7224L45.6256 34.7214ZM41.56 34.7214V35.0152H42.2503V36.9304H42.6151V35.0152H43.3072V34.7214H41.56Z"
+              fill="white"
+            />
+          </svg>
+        </a>
+
+        <div className={CLASS_GRID}>
+          {data.columns.map((column, index) => (
+            <div key={`footer-column-${index}`}>
+              <h5 className={CLASS_TITLE}>{column.title}</h5>
+              <ul className={CLASS_LIST}>
+                {column.links.map((link, linkIndex) => (
+                  <li
+                    className="mb-small"
+                    key={`footer-link-${index}-${linkIndex}`}
+                  >
+                    <a href={link.url}>{link.label}</a>
+                  </li>
+                ))}
+              </ul>
+            </div>
+          ))}
+        </div>
 
-      <hr />
-      {/* TODO - socky siete */}
-      <p className="small">Sledujte nás</p>
+        <hr />
+        {/* TODO - socky siete */}
+        <p>Sledujte nás</p>
 
-      <hr />
+        <hr />
 
-      <Grid className="align-items-end" rowGapSize="xlarge">
-        <GridCol size={{ xs: 12, md: 9 }}>
-          <Bar className="mb-none" space="small">
+        <div className={CLASS_BOTTOM}>
+          <ul className={cx(CLASS_LIST, CLASS_LIST_INLINE)}>
             {data.bottomLinks?.map((link, index) => (
-              <BarItem key={`footer-bottom-link-${index}`}>
-                <Link href={link.url} isNormal>
-                  {link.label}
-                </Link>
-              </BarItem>
+              <li className="mr-small" key={`footer-legal-link-${index}`}>
+                <a href={link.url}>{link.label}</a>
+              </li>
             ))}
-          </Bar>
-        </GridCol>
-        <GridCol size={{ xs: 12, md: 3 }}>{data.copyright}</GridCol>
-      </Grid>
-    </Section>
+          </ul>
+          <span className={CLASS_BOTTOM_COPYRIGHT}>{data.copyright}</span>
+        </div>
+      </div>
+    </footer>
   );
 };
 

package/src/components/Footer/constants.ts

@@ -0,0 +1,10 @@
+export const CLASS_ROOT = "footer";
+
+export const CLASS_CONTAINER = `${CLASS_ROOT}__container`;
+export const CLASS_GRID = `${CLASS_ROOT}__grid`;
+export const CLASS_LOGO = `${CLASS_ROOT}__logo`;
+export const CLASS_TITLE = `${CLASS_ROOT}__title`;
+export const CLASS_LIST = `${CLASS_ROOT}__list`;
+export const CLASS_LIST_INLINE = `${CLASS_ROOT}__list--inline`;
+export const CLASS_BOTTOM = `${CLASS_ROOT}__bottom`;
+export const CLASS_BOTTOM_COPYRIGHT = `${CLASS_ROOT}__bottom-copyright`;

package/src/components/Footer/styles/config.scss

@@ -0,0 +1 @@
+$class-root: ".footer" !default;

package/src/components/Footer/styles/mixins.scss

@@ -0,0 +1,172 @@
+@use "sass:map";
+@use "../../../styles/tools/convert";
+@use "../../../styles/tokens/color";
+@use "../../../styles/tokens/base";
+@use "../../../styles/tokens/breakpoint";
+@use "../../../styles/tools/generate";
+@use "../../../styles/tools/visibility" as visibility;
+@use "../../Container/styles/mixins" as container;
+@use "../../../styles/typography/mixins" as typography;
+@use "../../../styles/typography/config" as typographyConfig;
+
+@mixin globals {
+  .sr-only {
+    @include visibility.visually-hidden;
+  }
+
+  a {
+    color: var(--color-text-default);
+    text-decoration: none;
+    font-size: inherit;
+
+    &:hover,
+    &:focus,
+    &:active {
+      text-decoration: underline;
+      text-underline-offset: convert.to-rem(4px);
+    }
+
+    &:focus-visible {
+      outline: 2px solid var(--color-border-accent);
+      outline-offset: 2px;
+    }
+  }
+
+  a[href],
+  area[href],
+  input,
+  select,
+  textarea,
+  button,
+  [type="button"],
+  iframe,
+  [tabindex]:not([tabindex="-1"]),
+  [contentEditable="true"] {
+    @include base.focusring;
+  }
+
+  * {
+    box-sizing: border-box;
+    letter-spacing: convert.to-rem(-0.1px);
+    line-height: convert.to-rem(18px);
+  }
+
+  ::selection {
+    background-color: base.$selection-background;
+    color: base.$text-color;
+  }
+
+  hr {
+    margin-top: convert.to-rem(30px);
+    margin-bottom: convert.to-rem(30px);
+    border: 0;
+    border-top: 1px solid var(--color-border-subtle);
+  }
+
+  p,
+  ul {
+    font-size: convert.to-rem(14px);
+    line-height: convert.to-rem(17.5px);
+  }
+}
+
+@mixin base {
+  font-size: 1rem;
+  color: var(--color-text-default);
+  background-color: var(--color-surface-primary);
+  box-sizing: border-box;
+  font-family: #{base.$font-family};
+  padding: convert.to-rem(60px) 0;
+
+  @include breakpoint.get("md", "down") {
+    padding: convert.to-rem(30px) 0;
+  }
+}
+
+@mixin container {
+  @include container.base;
+
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+@mixin grid {
+  display: grid;
+  gap: convert.to-rem(30px);
+  row-gap: convert.to-rem(40px);
+  grid-template-columns: repeat(1, 1fr);
+
+  @include breakpoint.get("sm") {
+    grid-template-columns: repeat(2, 1fr);
+  }
+
+  @include breakpoint.get("md") {
+    grid-template-columns: repeat(3, 1fr);
+    gap: convert.to-rem(15px);
+    row-gap: convert.to-rem(20px);
+  }
+
+  @include breakpoint.get("lg") {
+    grid-template-columns: repeat(4, 1fr);
+    gap: convert.to-rem(30px);
+    row-gap: convert.to-rem(40px);
+  }
+}
+
+@mixin logo {
+  display: inline-flex;
+  margin-bottom: convert.to-rem(60px);
+
+  @include breakpoint.get("md", "down") {
+    margin-bottom: convert.to-rem(30px);
+  }
+}
+
+@mixin title {
+  @include generate.responsive-css-map(map.get(typographyConfig.$headings, 5));
+  margin-top: 0;
+  margin-bottom: convert.to-rem(30px);
+  color: var(--color-text-default);
+
+  @include breakpoint.get("md", "down") {
+    margin-bottom: convert.to-rem(25px);
+  }
+}
+
+@mixin list {
+  @include typography.list-unstyled;
+
+  li {
+    margin-bottom: convert.to-rem(10px);
+  }
+}
+
+@mixin list-inline {
+  display: flex;
+  flex-wrap: wrap;
+  gap: convert.to-rem(10px);
+
+  li {
+    margin: 0;
+  }
+}
+
+@mixin bottom {
+  display: grid;
+  gap: convert.to-rem(30px);
+  row-gap: convert.to-rem(40px);
+  grid-template-columns: repeat(1, 1fr);
+  align-items: end;
+
+  @include breakpoint.get("md") {
+    grid-template-columns: 3fr 1fr;
+  }
+}
+
+@mixin bottom-copyright {
+  text-align: right;
+
+  @include breakpoint.get("md", "down") {
+    text-align: inherit;
+  }
+}