Merge branch 'master' into pagination-v1

.huskyrc.json

@@ -1,6 +1,6 @@
 {
   "hooks": {
-    "pre-commit": "yarn test && lint-staged",
+    "pre-commit": "lint-staged",
     "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
   }
 }

src/meter/stories/CircularMeter.stories.tsx

@@ -1,130 +1,27 @@
 import React from "react";
 import { Meta } from "@storybook/react";
-import { css, keyframes } from "emotion";
-import { isUndefined } from "@chakra-ui/utils";
 
 import { Meter } from "../Meter";
 import { useMeterState } from "../index";
-import { useMeterSimulation } from "./utils";
+import { useFakeProgression, createCircularExample } from "../../utils";
 
 export default {
   title: "Component/Meter/Circular",
 } as Meta;
 
-const spin = keyframes({
-  "0%": {
-    strokeDasharray: "1, 400",
-    strokeDashoffset: "0",
-  },
-  "50%": {
-    strokeDasharray: "400, 400",
-    strokeDashoffset: "-100",
-  },
-  "100%": {
-    strokeDasharray: "400, 400",
-    strokeDashoffset: "-260",
-  },
+const CircularMeter = createCircularExample({
+  stateHook: useMeterState,
+  component: Meter,
 });
 
-const rotate = keyframes({
-  "0%": {
-    transform: "rotate(0deg)",
-  },
-  "100%": {
-    transform: "rotate(360deg)",
-  },
-});
-
-const CircularMeter = (props: any) => {
-  const {
-    size = "48px",
-    value,
-    capIsRound,
-    thickness = "10px",
-    color = "#0078d4",
-    trackColor = "#edebe9",
-    label = false,
-  } = props;
-
-  const progress = useMeterState({ value });
-
-  const determinant = progress.isIndeterminate
-    ? undefined
-    : (progress.percent ?? 0) * 2.64;
-
-  const strokeDasharray = isUndefined(determinant)
-    ? undefined
-    : `${determinant} ${264 - determinant}`;
-
-  const indicatorStyles = progress.isIndeterminate
-    ? css({
-        animation: `${spin} 1.5s linear infinite`,
-      })
-    : css({
-        strokeDashoffset: 66,
-        strokeDasharray,
-        transition: `stroke-dasharray 0.6s ease 0s, stroke 0.6s ease`,
-      });
-
-  const rootStyles = css({
-    display: "inline-block",
-    position: "relative",
-    verticalAlign: "middle",
-  });
-
-  const svgStyles = css({
-    width: size,
-    height: size,
-    animation: progress.isIndeterminate
-      ? `${rotate} 2s linear infinite`
-      : undefined,
-  });
-
-  const labelStyles = css({
-    fontSize: "14px",
-    top: "50%",
-    left: "50%",
-    width: "100%",
-    textAlign: "center",
-    position: "absolute",
-    transform: "translate(-50%, -50%)",
-  });
-
-  return (
-    <Meter {...progress} className={rootStyles}>
-      <svg viewBox="0 0 100 100" className={svgStyles}>
-        <circle
-          cx={50}
-          cy={50}
-          r={42}
-          fill="transparent"
-          stroke={trackColor}
-          strokeWidth={thickness}
-        />
-        <circle
-          cx={50}
-          cy={50}
-          r={42}
-          fill="transparent"
-          stroke={color}
-          strokeWidth={thickness}
-          strokeLinecap={capIsRound ? "round" : undefined}
-          className={indicatorStyles}
-        />
-      </svg>
-      {label && <div className={labelStyles}>{`${progress.value}%`}</div>}
-    </Meter>
-  );
-};
-
 export const Default = () => {
-  const value = useMeterSimulation();
+  const value = useFakeProgression("meter");
 
   return <CircularMeter value={value} />;
 };
 
 export const WithLabel = () => {
-  const value = useMeterSimulation();
+  const value = useFakeProgression("meter");
 
   return <CircularMeter value={value} label />;
 };

src/meter/stories/LinearMeter.stories.tsx

@@ -1,82 +1,20 @@
-import React from "react";
 import { Meta } from "@storybook/react";
-import { css, keyframes, cx } from "emotion";
 
 import { Meter } from "../Meter";
 import { useMeterState } from "../index";
-import {
-  generateStripe,
-  labelStyles,
-  useMeterSimulation,
-  progressBarStyle,
-  progressStyle,
-} from "./utils";
+import { createLinearExamples } from "../../utils";
 
 export default {
   title: "Component/Meter/Linear",
 } as Meta;
 
-export const Default = () => {
-  const value = useMeterSimulation();
-  const progress = useMeterState({ value });
+const examples = createLinearExamples({
+  stateHook: useMeterState,
+  component: Meter,
+  type: "meter",
+})();
 
-  return (
-    <div style={progressStyle}>
-      <Meter {...progress} className={progressBarStyle(progress.percent)} />
-    </div>
-  );
-};
-
-export const WithLabel = () => {
-  const value = useMeterSimulation();
-  const progress = useMeterState({ value });
-
-  return (
-    <div style={progressStyle}>
-      <div style={labelStyles}>{progress.value}</div>
-      <Meter {...progress} className={progressBarStyle(progress.percent)} />
-    </div>
-  );
-};
-
-export const WithStripe = () => {
-  const value = useMeterSimulation();
-  const progress = useMeterState({ value });
-
-  const stripStyles = css({
-    ...generateStripe(),
-  });
-
-  return (
-    <div style={progressStyle}>
-      <Meter
-        {...progress}
-        className={cx(progressBarStyle(progress.percent), stripStyles)}
-      />
-    </div>
-  );
-};
-
-export const WithAnimatedStripe = () => {
-  const value = useMeterSimulation();
-  const progress = useMeterState({ value });
-
-  const stripe = keyframes({
-    from: { backgroundPosition: "1rem 0" },
-    to: { backgroundPosition: "0 0" },
-  });
-
-  const stripStyles = css({
-    ...generateStripe(),
-    animation: `${stripe} 1s linear infinite`,
-  });
-
-  return (
-    <div style={progressStyle}>
-      <Meter
-        {...progress}
-        className={cx(progressBarStyle(progress.percent), stripStyles)}
-      />
-    </div>
-  );
-};
+export const Default = examples.Default;
+export const WithLabel = examples.WithLabel;
+export const WithStripe = examples.WithStripe;
+export const WithAnimatedStripe = examples.WithAnimatedStripe;