@hitachivantara/uikit-react-core 5.18.5 → 5.19.0

package/dist/cjs/components/Button/Button.cjs

@@ -1,94 +1,70 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const clsx = require("clsx");
 const React = require("react");
 const Button_styles = require("./Button.styles.cjs");
-const buttonClasses = require("./buttonClasses.cjs");
 const jsxRuntime = require("@emotion/react/jsx-runtime");
 const useTheme = require("../../hooks/useTheme.cjs");
 const mapVariant = (variant, theme) => {
-  if (theme !== "ds3") {
-    if (variant === "secondary") {
-      console.warn("Button variant 'secondary' is deprecated. Please use 'secondarySubtle'.");
-      return "secondarySubtle";
-    }
-    if (variant === "ghost") {
-      console.warn("Button variant 'ghost' is deprecated. Please use 'primaryGhost'.");
-      return "primaryGhost";
-    }
+  if (theme === "ds3")
+    return variant;
+  const deprecatedVariantMap = {
+    secondary: "secondarySubtle",
+    ghost: "primaryGhost"
+  };
+  const mappedVariant = deprecatedVariantMap[variant];
+  if (mappedVariant) {
+    console.warn(`Button variant '${variant}' is deprecated. Please use '${mappedVariant}'.`);
   }
-  return variant;
+  return mappedVariant || variant;
 };
 const HvButton = React.forwardRef((props, ref) => {
   const {
     id,
-    classes,
+    classes: classesProp,
     children,
-    variant = "primary",
-    onClick,
+    variant: variantProp = "primary",
     disabled = false,
     className,
     startIcon,
     endIcon,
     icon = false,
     size,
-    radius = "base",
+    radius,
     overrideIconColors = true,
     component: Component = "button",
     ...others
   } = props;
+  const {
+    classes,
+    css,
+    cx
+  } = Button_styles.useClasses(classesProp);
   const {
     activeTheme
   } = useTheme.useTheme();
-  const onFocusHandler = (event) => {
-    event.target.classList.add("HvIsFocusVisible");
-    event.target.classList.add(buttonClasses.default.focusVisible);
-    if (classes == null ? void 0 : classes.focusVisible) {
-      event.target.classList.add(classes.focusVisible);
-    }
-  };
-  const onBlurHandler = (event) => {
-    event.target.classList.remove("HvIsFocusVisible");
-    event.target.classList.remove(buttonClasses.default.focusVisible);
-    if (classes == null ? void 0 : classes.focusVisible) {
-      event.target.classList.remove(classes.focusVisible);
-    }
-  };
-  const StyledComponent = React.useMemo(() => Button_styles.StyledButton(Component), [Component]);
-  return /* @__PURE__ */ jsxRuntime.jsx(StyledComponent, {
-    id,
+  const variant = mapVariant(variantProp, activeTheme == null ? void 0 : activeTheme.name);
+  return /* @__PURE__ */ jsxRuntime.jsxs(Component, {
     ref,
     type: "button",
-    className: clsx.clsx(className, classes == null ? void 0 : classes.root, buttonClasses.default.root),
-    onClick,
-    onFocus: onFocusHandler,
-    onBlur: onBlurHandler,
-    $variant: mapVariant(variant, activeTheme == null ? void 0 : activeTheme.name),
-    $iconOnly: icon,
-    $size: size,
-    $radius: radius,
-    $overrideIconColors: overrideIconColors,
-    $startIcon: !!startIcon,
-    $endIcon: !!endIcon,
+    className: cx(classes.root, css(Button_styles.getVariantStyles(variant)), size && css(Button_styles.getSizeStyles(size)), radius && css(Button_styles.getRadiusStyles(radius)), overrideIconColors && css(Button_styles.getOverrideColors(variant)), {
+      [classes.icon]: icon,
+      [classes.disabled]: disabled
+    }, className),
     ...disabled && {
-      $disabled: true,
       disabled: true,
       tabIndex: -1,
       "aria-disabled": true
     },
     ...others,
-    children: /* @__PURE__ */ jsxRuntime.jsxs(Button_styles.StyledContentDiv, {
-      children: [startIcon && /* @__PURE__ */ jsxRuntime.jsx(Button_styles.StyledIconSpan, {
-        className: clsx.clsx(classes == null ? void 0 : classes.startIcon, buttonClasses.default.startIcon),
-        children: startIcon
-      }), children && /* @__PURE__ */ jsxRuntime.jsx(Button_styles.StyledChildren, {
-        children
-      }), endIcon && /* @__PURE__ */ jsxRuntime.jsx(Button_styles.StyledIconSpan, {
-        className: clsx.clsx(classes == null ? void 0 : classes.endIcon, buttonClasses.default.endIcon),
-        children: endIcon
-      })]
-    })
+    children: [startIcon && /* @__PURE__ */ jsxRuntime.jsx("span", {
+      className: classes.startIcon,
+      children: startIcon
+    }), children, endIcon && /* @__PURE__ */ jsxRuntime.jsx("span", {
+      className: classes.endIcon,
+      children: endIcon
+    })]
   });
 });
+exports.buttonClasses = Button_styles.staticClasses;
 exports.HvButton = HvButton;
 //# sourceMappingURL=Button.cjs.map

package/dist/cjs/components/Button/Button.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"Button.cjs","sources":["../../../../src/components/Button/Button.tsx"],"sourcesContent":["import { clsx } from \"clsx\";\nimport React, { forwardRef, ReactElement, useMemo } from \"react\";\nimport { useTheme } from \"@core/hooks\";\nimport { PolymorphicComponentRef, PolymorphicRef } from \"@core/types\";\nimport {\n  StyledButton,\n  StyledChildren,\n  StyledContentDiv,\n  StyledIconSpan,\n} from \"./Button.styles\";\nimport buttonClasses, { HvButtonClasses } from \"./buttonClasses\";\n\nexport const buttonVariant = [\n  \"primary\",\n  \"primarySubtle\",\n  \"primaryGhost\",\n  \"secondarySubtle\",\n  \"secondaryGhost\",\n  \"semantic\",\n  // deprecated props\n  \"secondary\",\n  \"ghost\",\n] as const;\nexport type HvButtonVariant = (typeof buttonVariant)[number];\n\nexport const buttonSize = [\"xs\", \"sm\", \"md\", \"lg\", \"xl\"] as const;\nexport type HvButtonSize = (typeof buttonSize)[number];\n\nexport const buttonRadius = [\n  \"none\",\n  \"base\",\n  \"round\",\n  \"circle\",\n  \"full\",\n] as const;\nexport type HvButtonRadius = (typeof buttonRadius)[number];\n\nexport type HvButtonProps<C extends React.ElementType = \"button\"> =\n  PolymorphicComponentRef<\n    C,\n    {\n      /** Use the variant prop to change the visual style of the Button. */\n      variant?: HvButtonVariant;\n      /** Whether the Button is an icon-only button. */\n      icon?: boolean;\n      /** Whether the Button is disabled or not. */\n      disabled?: boolean;\n      /** Class names to be applied. */\n      className?: string;\n      /** Element placed before the children. */\n      startIcon?: ReactElement;\n      /** Element placed after the children. */\n      endIcon?: ReactElement;\n      /** Button size. */\n      size?: HvButtonSize;\n      /** Button border radius. */\n      radius?: HvButtonRadius;\n      /** Defines the default colors of the button are forced into the icon. */\n      overrideIconColors?: boolean;\n      /** A Jss Object used to override or extend the styles applied. */\n      classes?: HvButtonClasses;\n      /** Whether the Button is selected or not. */\n      selected?: boolean;\n    }\n  >;\n\n/**\n * Normalize the button variant. It's meant to give us some retro-compatibility with\n * the DS 3.6 API.\n *\n * @param variant the variant of the button\n * @returns       the normalized variant in DS 5 API\n */\nconst mapVariant = (\n  variant: HvButtonVariant,\n  theme?: string\n): HvButtonVariant => {\n  if (theme !== \"ds3\") {\n    if (variant === \"secondary\") {\n      // eslint-disable-next-line no-console\n      console.warn(\n        \"Button variant 'secondary' is deprecated. Please use 'secondarySubtle'.\"\n      );\n      return \"secondarySubtle\";\n    }\n    if (variant === \"ghost\") {\n      // eslint-disable-next-line no-console\n      console.warn(\n        \"Button variant 'ghost' is deprecated. Please use 'primaryGhost'.\"\n      );\n      return \"primaryGhost\";\n    }\n  }\n  return variant;\n};\n\n/**\n * Button component is used to trigger an action or event.\n */\nexport const HvButton: <C extends React.ElementType = \"button\">(\n  props: HvButtonProps<C>\n) => React.ReactElement | null = forwardRef(\n  <C extends React.ElementType = \"button\">(\n    props: HvButtonProps<C>,\n    ref: PolymorphicRef<C>\n  ) => {\n    const {\n      id,\n      classes,\n      children,\n      variant = \"primary\",\n      onClick,\n      disabled = false,\n      className,\n      startIcon,\n      endIcon,\n      icon = false,\n      size,\n      radius = \"base\",\n      overrideIconColors = true,\n      component: Component = \"button\",\n      ...others\n    } = props;\n\n    const { activeTheme } = useTheme();\n\n    const onFocusHandler = (event) => {\n      event.target.classList.add(\"HvIsFocusVisible\");\n      event.target.classList.add(buttonClasses.focusVisible);\n      if (classes?.focusVisible) {\n        event.target.classList.add(classes.focusVisible);\n      }\n    };\n\n    const onBlurHandler = (event) => {\n      event.target.classList.remove(\"HvIsFocusVisible\");\n      event.target.classList.remove(buttonClasses.focusVisible);\n      if (classes?.focusVisible) {\n        event.target.classList.remove(classes.focusVisible);\n      }\n    };\n\n    const StyledComponent = useMemo(() => StyledButton(Component), [Component]);\n\n    return (\n      <StyledComponent\n        id={id}\n        ref={ref}\n        type=\"button\"\n        className={clsx(className, classes?.root, buttonClasses.root)}\n        onClick={onClick}\n        onFocus={onFocusHandler}\n        onBlur={onBlurHandler}\n        $variant={mapVariant(variant, activeTheme?.name)}\n        $iconOnly={icon}\n        $size={size}\n        $radius={radius}\n        $overrideIconColors={overrideIconColors}\n        $startIcon={!!startIcon}\n        $endIcon={!!endIcon}\n        {...(disabled && {\n          $disabled: true,\n          disabled: true,\n          tabIndex: -1,\n          \"aria-disabled\": true,\n        })}\n        {...others}\n      >\n        <StyledContentDiv>\n          {startIcon && (\n            <StyledIconSpan\n              className={clsx(classes?.startIcon, buttonClasses.startIcon)}\n            >\n              {startIcon}\n            </StyledIconSpan>\n          )}\n          {children && <StyledChildren>{children}</StyledChildren>}\n          {endIcon && (\n            <StyledIconSpan\n              className={clsx(classes?.endIcon, buttonClasses.endIcon)}\n            >\n              {endIcon}\n            </StyledIconSpan>\n          )}\n        </StyledContentDiv>\n      </StyledComponent>\n    );\n  }\n);\n"],"names":["mapVariant","variant","theme","console","warn","HvButton","forwardRef","props","ref","id","classes","children","onClick","disabled","className","startIcon","endIcon","icon","size","radius","overrideIconColors","component","Component","others","activeTheme","useTheme","onFocusHandler","event","target","classList","add","buttonClasses","focusVisible","onBlurHandler","remove","StyledComponent","useMemo","StyledButton","type","clsx","root","onFocus","onBlur","$variant","name","$iconOnly","$size","$radius","$overrideIconColors","$startIcon","$endIcon","$disabled","tabIndex","StyledContentDiv","_jsx","StyledIconSpan","StyledChildren"],"mappings":";;;;;;;;AAyEA,MAAMA,aAAaA,CACjBC,SACAC,UACoB;AACpB,MAAIA,UAAU,OAAO;AACnB,QAAID,YAAY,aAAa;AAE3BE,cAAQC,KACN,yEACF;AACO,aAAA;AAAA,IACT;AACA,QAAIH,YAAY,SAAS;AAEvBE,cAAQC,KACN,kEACF;AACO,aAAA;AAAA,IACT;AAAA,EACF;AACOH,SAAAA;AACT;AAKO,MAAMI,WAEoBC,MAAAA,WAC/B,CACEC,OACAC,QACG;AACG,QAAA;AAAA,IACJC;AAAAA,IACAC;AAAAA,IACAC;AAAAA,IACAV,UAAU;AAAA,IACVW;AAAAA,IACAC,WAAW;AAAA,IACXC;AAAAA,IACAC;AAAAA,IACAC;AAAAA,IACAC,OAAO;AAAA,IACPC;AAAAA,IACAC,SAAS;AAAA,IACTC,qBAAqB;AAAA,IACrBC,WAAWC,YAAY;AAAA,IACvB,GAAGC;AAAAA,EACDhB,IAAAA;AAEE,QAAA;AAAA,IAAEiB;AAAAA,MAAgBC,SAAS,SAAA;AAEjC,QAAMC,iBAAkBC,CAAU,UAAA;AAC1BC,UAAAA,OAAOC,UAAUC,IAAI,kBAAkB;AAC7CH,UAAMC,OAAOC,UAAUC,IAAIC,cAAAA,QAAcC,YAAY;AACrD,QAAItB,mCAASsB,cAAc;AACzBL,YAAMC,OAAOC,UAAUC,IAAIpB,QAAQsB,YAAY;AAAA,IACjD;AAAA,EAAA;AAGF,QAAMC,gBAAiBN,CAAU,UAAA;AACzBC,UAAAA,OAAOC,UAAUK,OAAO,kBAAkB;AAChDP,UAAMC,OAAOC,UAAUK,OAAOH,cAAAA,QAAcC,YAAY;AACxD,QAAItB,mCAASsB,cAAc;AACzBL,YAAMC,OAAOC,UAAUK,OAAOxB,QAAQsB,YAAY;AAAA,IACpD;AAAA,EAAA;AAGIG,QAAAA,kBAAkBC,MAAAA,QAAQ,MAAMC,cAAAA,aAAaf,SAAS,GAAG,CAACA,SAAS,CAAC;AAE1E,wCACGa,iBAAe;AAAA,IACd1B;AAAAA,IACAD;AAAAA,IACA8B,MAAK;AAAA,IACLxB,WAAWyB,KAAKzB,KAAAA,WAAWJ,mCAAS8B,MAAMT,sBAAcS,IAAI;AAAA,IAC5D5B;AAAAA,IACA6B,SAASf;AAAAA,IACTgB,QAAQT;AAAAA,IACRU,UAAU3C,WAAWC,SAASuB,2CAAaoB,IAAI;AAAA,IAC/CC,WAAW5B;AAAAA,IACX6B,OAAO5B;AAAAA,IACP6B,SAAS5B;AAAAA,IACT6B,qBAAqB5B;AAAAA,IACrB6B,YAAY,CAAC,CAAClC;AAAAA,IACdmC,UAAU,CAAC,CAAClC;AAAAA,IAAQ,GACfH,YAAY;AAAA,MACfsC,WAAW;AAAA,MACXtC,UAAU;AAAA,MACVuC,UAAU;AAAA,MACV,iBAAiB;AAAA,IACnB;AAAA,IAAC,GACG7B;AAAAA,IAAMZ,0CAET0C,gCAAgB;AAAA,MAAA1C,UACdI,CAAAA,aACCuC,2BAAAA,IAACC,8BAAc;AAAA,QACbzC,WAAWyB,KAAAA,KAAK7B,mCAASK,WAAWgB,cAAAA,QAAchB,SAAS;AAAA,QAAEJ,UAE5DI;AAAAA,MAAAA,CACa,GAEjBJ,YAAY2C,2BAAAA,IAACE,8BAAc;AAAA,QAAA7C;AAAAA,MAAAA,CAA2B,GACtDK,WACCsC,2BAAAA,IAACC,8BAAc;AAAA,QACbzC,WAAWyB,KAAAA,KAAK7B,mCAASM,SAASe,cAAAA,QAAcf,OAAO;AAAA,QAAEL,UAExDK;AAAAA,MAAAA,CACa,CACjB;AAAA,IAAA,CACe;AAAA,EAAA,CACH;AAErB,CACF;;"}
+{"version":3,"file":"Button.cjs","sources":["../../../../src/components/Button/Button.tsx"],"sourcesContent":["import React, { forwardRef, ReactElement } from \"react\";\nimport { useTheme } from \"@core/hooks\";\nimport { PolymorphicComponentRef, PolymorphicRef } from \"@core/types\";\nimport { ExtractNames } from \"@core/utils\";\nimport {\n  staticClasses as buttonClasses,\n  getOverrideColors,\n  getRadiusStyles,\n  getSizeStyles,\n  getVariantStyles,\n  useClasses,\n} from \"./Button.styles\";\n\nexport { buttonClasses };\n\nexport type HvButtonClasses = ExtractNames<typeof useClasses>;\n\nexport const buttonVariant = [\n  \"primary\",\n  \"primarySubtle\",\n  \"primaryGhost\",\n  \"secondarySubtle\",\n  \"secondaryGhost\",\n  \"semantic\",\n  // deprecated props\n  \"secondary\",\n  \"ghost\",\n] as const;\nexport type HvButtonVariant = (typeof buttonVariant)[number];\n\nexport const buttonSize = [\"xs\", \"sm\", \"md\", \"lg\", \"xl\"] as const;\nexport type HvButtonSize = (typeof buttonSize)[number];\n\nexport const buttonRadius = [\n  \"none\",\n  \"base\",\n  \"round\",\n  \"circle\",\n  \"full\",\n] as const;\nexport type HvButtonRadius = (typeof buttonRadius)[number];\n\nexport type HvButtonProps<C extends React.ElementType = \"button\"> =\n  PolymorphicComponentRef<\n    C,\n    {\n      /** Use the variant prop to change the visual style of the Button. */\n      variant?: HvButtonVariant;\n      /** Whether the Button is an icon-only button. */\n      icon?: boolean;\n      /** Whether the Button is disabled or not. */\n      disabled?: boolean;\n      /** Class names to be applied. */\n      className?: string;\n      /** Element placed before the children. */\n      startIcon?: ReactElement;\n      /** Element placed after the children. */\n      endIcon?: ReactElement;\n      /** Button size. */\n      size?: HvButtonSize;\n      /** Button border radius. */\n      radius?: HvButtonRadius;\n      /** Defines the default colors of the button are forced into the icon. */\n      overrideIconColors?: boolean;\n      /** A Jss Object used to override or extend the styles applied. */\n      classes?: HvButtonClasses;\n      /** Whether the Button is selected or not. */\n      selected?: boolean;\n    }\n  >;\n\n/**\n * Normalize the button variant. It's meant to give us some retro-compatibility with\n * the DS 3.6 API.\n * @returns the normalized variant in DS 5 API\n */\nconst mapVariant = (\n  variant: HvButtonVariant,\n  theme?: string\n): HvButtonVariant => {\n  if (theme === \"ds3\") return variant;\n\n  const deprecatedVariantMap: Record<string, HvButtonVariant> = {\n    secondary: \"secondarySubtle\",\n    ghost: \"primaryGhost\",\n  };\n\n  const mappedVariant = deprecatedVariantMap[variant];\n\n  if (mappedVariant) {\n    // eslint-disable-next-line no-console\n    console.warn(\n      `Button variant '${variant}' is deprecated. Please use '${mappedVariant}'.`\n    );\n  }\n\n  return mappedVariant || variant;\n};\n\n/**\n * Button component is used to trigger an action or event.\n */\nexport const HvButton: <C extends React.ElementType = \"button\">(\n  props: HvButtonProps<C>\n) => React.ReactElement | null = forwardRef(\n  <C extends React.ElementType = \"button\">(\n    props: HvButtonProps<C>,\n    ref: PolymorphicRef<C>\n  ) => {\n    const {\n      id,\n      classes: classesProp,\n      children,\n      variant: variantProp = \"primary\",\n      disabled = false,\n      className,\n      startIcon,\n      endIcon,\n      icon = false,\n      size,\n      radius,\n      overrideIconColors = true,\n      component: Component = \"button\",\n      ...others\n    } = props;\n    const { classes, css, cx } = useClasses(classesProp);\n    const { activeTheme } = useTheme();\n\n    const variant = mapVariant(variantProp, activeTheme?.name);\n\n    return (\n      <Component\n        ref={ref}\n        type=\"button\"\n        className={cx(\n          classes.root,\n          css(getVariantStyles(variant)),\n          size && css(getSizeStyles(size)),\n          radius && css(getRadiusStyles(radius)),\n          overrideIconColors && css(getOverrideColors(variant)),\n          {\n            [classes.icon]: icon,\n            [classes.disabled]: disabled,\n          },\n          className\n        )}\n        {...(disabled && {\n          disabled: true,\n          tabIndex: -1,\n          \"aria-disabled\": true,\n        })}\n        {...others}\n      >\n        {startIcon && <span className={classes.startIcon}>{startIcon}</span>}\n        {children}\n        {endIcon && <span className={classes.endIcon}>{endIcon}</span>}\n      </Component>\n    );\n  }\n);\n"],"names":["mapVariant","variant","theme","deprecatedVariantMap","secondary","ghost","mappedVariant","warn","HvButton","forwardRef","props","ref","id","classes","classesProp","children","variantProp","disabled","className","startIcon","endIcon","icon","size","radius","overrideIconColors","component","Component","others","css","cx","useClasses","activeTheme","useTheme","name","type","root","getVariantStyles","getSizeStyles","getRadiusStyles","getOverrideColors","tabIndex","_jsx"],"mappings":";;;;;;AA4EA,MAAMA,aAAaA,CACjBC,SACAC,UACoB;AACpB,MAAIA,UAAU;AAAcD,WAAAA;AAE5B,QAAME,uBAAwD;AAAA,IAC5DC,WAAW;AAAA,IACXC,OAAO;AAAA,EAAA;AAGHC,QAAAA,gBAAgBH,qBAAqBF,OAAO;AAElD,MAAIK,eAAe;AAETC,YAAAA,KACL,mBAAkBN,uCAAuCK,iBAC5D;AAAA,EACF;AAEA,SAAOA,iBAAiBL;AAC1B;AAKO,MAAMO,WAEoBC,MAAAA,WAC/B,CACEC,OACAC,QACG;AACG,QAAA;AAAA,IACJC;AAAAA,IACAC,SAASC;AAAAA,IACTC;AAAAA,IACAd,SAASe,cAAc;AAAA,IACvBC,WAAW;AAAA,IACXC;AAAAA,IACAC;AAAAA,IACAC;AAAAA,IACAC,OAAO;AAAA,IACPC;AAAAA,IACAC;AAAAA,IACAC,qBAAqB;AAAA,IACrBC,WAAWC,YAAY;AAAA,IACvB,GAAGC;AAAAA,EACDjB,IAAAA;AACE,QAAA;AAAA,IAAEG;AAAAA,IAASe;AAAAA,IAAKC;AAAAA,EAAAA,IAAOC,cAAAA,WAAWhB,WAAW;AAC7C,QAAA;AAAA,IAAEiB;AAAAA,MAAgBC,SAAS,SAAA;AAEjC,QAAM/B,UAAUD,WAAWgB,aAAae,2CAAaE,IAAI;AAEzD,yCACGP,WAAS;AAAA,IACRf;AAAAA,IACAuB,MAAK;AAAA,IACLhB,WAAWW,GACThB,QAAQsB,MACRP,IAAIQ,+BAAiBnC,OAAO,CAAC,GAC7BqB,QAAQM,IAAIS,cAAcf,cAAAA,IAAI,CAAC,GAC/BC,UAAUK,IAAIU,cAAAA,gBAAgBf,MAAM,CAAC,GACrCC,sBAAsBI,IAAIW,gCAAkBtC,OAAO,CAAC,GACpD;AAAA,MACE,CAACY,QAAQQ,IAAI,GAAGA;AAAAA,MAChB,CAACR,QAAQI,QAAQ,GAAGA;AAAAA,OAEtBC,SACF;AAAA,IAAE,GACGD,YAAY;AAAA,MACfA,UAAU;AAAA,MACVuB,UAAU;AAAA,MACV,iBAAiB;AAAA,IACnB;AAAA,IAAC,GACGb;AAAAA,IAAMZ,UAAA,CAETI,aAAasB,2BAAAA,IAAA,QAAA;AAAA,MAAMvB,WAAWL,QAAQM;AAAAA,MAAUJ,UAAEI;AAAAA,IAAgB,CAAA,GAClEJ,UACAK,0CAAW,QAAA;AAAA,MAAMF,WAAWL,QAAQO;AAAAA,MAAQL,UAAEK;AAAAA,IAAAA,CAAc,CAAC;AAAA,EAAA,CACrD;AAEf,CACF;;;"}