@strapi/plugin-color-picker 0.0.0-next.e037a7b2d1f48b7bd8bcd0d9400ca0f9ded8a982 → 0.0.0-next.e1ede8c55a0e1e22ce20137bf238fc374bd5dd51

package/package.json

@@ -1,53 +1,7 @@
 {
   "name": "@strapi/plugin-color-picker",
-  "version": "0.0.0-next.e037a7b2d1f48b7bd8bcd0d9400ca0f9ded8a982",
+  "version": "0.0.0-next.e1ede8c55a0e1e22ce20137bf238fc374bd5dd51",
   "description": "Strapi maintained Custom Fields",
-  "strapi": {
-    "name": "color-picker",
-    "description": "Color picker custom field",
-    "kind": "plugin",
-    "displayName": "Color Picker"
-  },
-  "dependencies": {
-    "@strapi/design-system": "1.9.0",
-    "@strapi/helper-plugin": "0.0.0-next.e037a7b2d1f48b7bd8bcd0d9400ca0f9ded8a982",
-    "@strapi/icons": "1.9.0",
-    "prop-types": "^15.8.1",
-    "react-colorful": "5.6.1",
-    "react-intl": "6.4.1"
-  },
-  "devDependencies": {
-    "@testing-library/react": "14.0.0",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "react-router-dom": "5.3.4",
-    "styled-components": "5.3.3"
-  },
-  "peerDependencies": {
-    "@strapi/strapi": "^4.4.0",
-    "react": "^17.0.0 || ^18.0.0",
-    "react-dom": "^17.0.0 || ^18.0.0",
-    "react-router-dom": "5.3.4",
-    "styled-components": "5.3.3"
-  },
-  "files": [
-    "./dist",
-    "./admin",
-    "strapi-admin.js",
-    "strapi-server.js"
-  ],
-  "scripts": {
-    "build": "run -T tsc -p server/tsconfig.json --outDir ./dist/server",
-    "build:ts": "run build",
-    "watch": "run -T tsc -w --preserveWatchOutput",
-    "clean": "run -T rimraf ./dist",
-    "prepublishOnly": "yarn clean && yarn build",
-    "test:front": "run -T cross-env IS_EE=true jest --config ./jest.config.front.js",
-    "test:front:watch": "run -T cross-env IS_EE=true jest --config ./jest.config.front.js --watchAll",
-    "test:front:ce": "run -T cross-env IS_EE=false jest --config ./jest.config.front.js",
-    "test:front:watch:ce": "run -T cross-env IS_EE=false jest --config ./jest.config.front.js --watchAll",
-    "lint": "run -T eslint ."
-  },
   "repository": {
     "type": "git",
     "url": "https://github.com/strapi/strapi.git",
@@ -66,9 +20,73 @@
       "url": "https://strapi.io"
     }
   ],
+  "exports": {
+    "./strapi-admin": {
+      "types": "./dist/admin/src/index.d.ts",
+      "source": "./admin/src/index.ts",
+      "import": "./dist/admin/index.mjs",
+      "require": "./dist/admin/index.js",
+      "default": "./dist/admin/index.js"
+    },
+    "./strapi-server": {
+      "types": "./dist/server/src/index.d.ts",
+      "source": "./server/src/index.ts",
+      "import": "./dist/server/index.mjs",
+      "require": "./dist/server/index.js",
+      "default": "./dist/server/index.js"
+    },
+    "./package.json": "./package.json"
+  },
+  "files": [
+    "./dist",
+    "strapi-server.js"
+  ],
+  "scripts": {
+    "build": "strapi plugin:build --force",
+    "clean": "run -T rimraf ./dist",
+    "lint": "run -T eslint .",
+    "test:front": "run -T cross-env IS_EE=true jest --config ./jest.config.front.js",
+    "test:front:ce": "run -T cross-env IS_EE=false jest --config ./jest.config.front.js",
+    "test:front:watch": "run -T cross-env IS_EE=true jest --config ./jest.config.front.js --watchAll",
+    "test:front:watch:ce": "run -T cross-env IS_EE=false jest --config ./jest.config.front.js --watchAll",
+    "test:ts:front": "run -T tsc -p admin/tsconfig.json",
+    "watch": "strapi plugin:watch"
+  },
+  "dependencies": {
+    "@strapi/design-system": "1.14.1",
+    "@strapi/helper-plugin": "0.0.0-next.e1ede8c55a0e1e22ce20137bf238fc374bd5dd51",
+    "@strapi/icons": "1.14.1",
+    "prop-types": "^15.8.1",
+    "react-colorful": "5.6.1",
+    "react-intl": "6.4.1"
+  },
+  "devDependencies": {
+    "@strapi/strapi": "0.0.0-next.e1ede8c55a0e1e22ce20137bf238fc374bd5dd51",
+    "@testing-library/react": "14.0.0",
+    "@testing-library/user-event": "14.4.3",
+    "@types/styled-components": "5.1.32",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "react-router-dom": "5.3.4",
+    "styled-components": "5.3.3",
+    "typescript": "5.2.2"
+  },
+  "peerDependencies": {
+    "@strapi/strapi": "^4.4.0",
+    "react": "^17.0.0 || ^18.0.0",
+    "react-dom": "^17.0.0 || ^18.0.0",
+    "react-router-dom": "^5.2.0",
+    "styled-components": "^5.2.1"
+  },
   "engines": {
-    "node": ">=16.0.0 <=20.x.x",
+    "node": ">=18.0.0 <=20.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "e037a7b2d1f48b7bd8bcd0d9400ca0f9ded8a982"
+  "strapi": {
+    "name": "color-picker",
+    "description": "Color picker custom field",
+    "kind": "plugin",
+    "displayName": "Color Picker"
+  },
+  "gitHead": "e1ede8c55a0e1e22ce20137bf238fc374bd5dd51"
 }

package/admin/src/components/ColorPicker/ColorPickerIcon/index.js

@@ -1,26 +0,0 @@
-import React from 'react';
-
-import { Flex, Icon } from '@strapi/design-system';
-import { Paint } from '@strapi/icons';
-import styled from 'styled-components';
-
-const IconBox = styled(Flex)`
-  /* Hard code color values */
-  /* to stay consistent between themes */
-  background-color: #f0f0ff; /* primary100 */
-  border: 1px solid #d9d8ff; /* primary200 */
-
-  svg > path {
-    fill: #4945ff; /* primary600 */
-  }
-`;
-
-const ColorPickerIcon = () => {
-  return (
-    <IconBox justifyContent="center" alignItems="center" width={7} height={6} hasRadius aria-hidden>
-      <Icon as={Paint} />
-    </IconBox>
-  );
-};
-
-export default ColorPickerIcon;

package/admin/src/components/ColorPicker/ColorPickerInput/index.js

@@ -1,214 +0,0 @@
-import React, { forwardRef, useRef, useState } from 'react';
-
-import {
-  BaseButton,
-  Box,
-  Field,
-  FieldError,
-  FieldHint,
-  FieldInput,
-  FieldLabel,
-  Flex,
-  FocusTrap,
-  Popover,
-  Typography,
-} from '@strapi/design-system';
-import { CarretDown } from '@strapi/icons';
-import PropTypes from 'prop-types';
-import { HexColorPicker } from 'react-colorful';
-import { useIntl } from 'react-intl';
-import styled from 'styled-components';
-
-import { useComposedRefs } from '../../../hooks/useComposeRefs';
-import getTrad from '../../../utils/getTrad';
-
-const ColorPreview = styled.div`
-  border-radius: 50%;
-  width: 20px;
-  height: 20px;
-  margin-right: 10px;
-  background-color: ${(props) => props.color};
-  border: 1px solid rgba(0, 0, 0, 0.1);
-`;
-
-const ColorPicker = styled(HexColorPicker)`
-  && {
-    width: 100%;
-    aspect-ratio: 1.5;
-  }
-
-  .react-colorful__pointer {
-    width: ${({ theme }) => theme.spaces[3]};
-    height: ${({ theme }) => theme.spaces[3]};
-  }
-
-  .react-colorful__saturation {
-    border-radius: ${({ theme }) => theme.spaces[1]};
-    border-bottom: none;
-  }
-
-  .react-colorful__hue {
-    border-radius: 10px;
-    height: ${({ theme }) => theme.spaces[3]};
-    margin-top: ${({ theme }) => theme.spaces[2]};
-  }
-`;
-
-const ColorPickerToggle = styled(BaseButton)`
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-
-  svg {
-    width: ${({ theme }) => theme.spaces[2]};
-    height: ${({ theme }) => theme.spaces[2]};
-  }
-
-  svg > path {
-    fill: ${({ theme }) => theme.colors.neutral500};
-    justify-self: flex-end;
-  }
-`;
-
-const ColorPickerPopover = styled(Popover)`
-  padding: ${({ theme }) => theme.spaces[2]};
-  min-height: 270px;
-`;
-
-const ColorPickerInput = forwardRef(
-  (
-    {
-      attribute,
-      description,
-      disabled,
-      error,
-      intlLabel,
-      labelAction,
-      name,
-      onChange,
-      required,
-      value,
-    },
-    forwardedRef
-  ) => {
-    const [showColorPicker, setShowColorPicker] = useState(false);
-    const colorPickerButtonRef = useRef();
-    const { formatMessage } = useIntl();
-    const color = value || '#000000';
-    const styleUppercase = { textTransform: 'uppercase' };
-
-    const handleBlur = (e) => {
-      e.preventDefault();
-
-      if (!e.currentTarget.contains(e.relatedTarget)) {
-        setShowColorPicker(false);
-      }
-    };
-
-    const composedRefs = useComposedRefs(forwardedRef, colorPickerButtonRef);
-
-    return (
-      <Field
-        name={name}
-        id={name}
-        // GenericInput calls formatMessage and returns a string for the error
-        error={error}
-        hint={description && formatMessage(description)}
-        required={required}
-      >
-        <Flex direction="column" alignItems="stretch" gap={1}>
-          <FieldLabel action={labelAction}>{formatMessage(intlLabel)}</FieldLabel>
-          <ColorPickerToggle
-            ref={composedRefs}
-            aria-label={formatMessage({
-              id: getTrad('color-picker.toggle.aria-label'),
-              defaultMessage: 'Color picker toggle',
-            })}
-            aria-controls="color-picker-value"
-            aria-haspopup="dialog"
-            aria-expanded={showColorPicker}
-            aria-disabled={disabled}
-            disabled={disabled}
-            onClick={() => setShowColorPicker(!showColorPicker)}
-          >
-            <Flex>
-              <ColorPreview color={color} />
-              <Typography
-                style={styleUppercase}
-                textColor={value ? null : 'neutral600'}
-                variant="omega"
-              >
-                {color}
-              </Typography>
-            </Flex>
-            <CarretDown aria-hidden />
-          </ColorPickerToggle>
-          {showColorPicker && (
-            <ColorPickerPopover
-              onBlur={handleBlur}
-              role="dialog"
-              source={colorPickerButtonRef}
-              spacing={4}
-            >
-              <FocusTrap onEscape={() => setShowColorPicker(false)}>
-                <ColorPicker
-                  color={color}
-                  onChange={(hexValue) =>
-                    onChange({ target: { name, value: hexValue, type: attribute.type } })
-                  }
-                />
-                <Flex paddingTop={3} paddingLeft={4} justifyContent="flex-end">
-                  <Box paddingRight={2}>
-                    <Typography variant="omega" as="label" textColor="neutral600">
-                      {formatMessage({
-                        id: getTrad('color-picker.input.format'),
-                        defaultMessage: 'HEX',
-                      })}
-                    </Typography>
-                  </Box>
-                  <FieldInput
-                    id="color-picker-value"
-                    aria-label={formatMessage({
-                      id: getTrad('color-picker.input.aria-label'),
-                      defaultMessage: 'Color picker input',
-                    })}
-                    style={styleUppercase}
-                    value={value}
-                    placeholder="#000000"
-                    onChange={onChange}
-                  />
-                </Flex>
-              </FocusTrap>
-            </ColorPickerPopover>
-          )}
-          <FieldHint />
-          <FieldError />
-        </Flex>
-      </Field>
-    );
-  }
-);
-
-ColorPickerInput.defaultProps = {
-  description: null,
-  disabled: false,
-  error: null,
-  labelAction: null,
-  required: false,
-  value: '',
-};
-
-ColorPickerInput.propTypes = {
-  intlLabel: PropTypes.object.isRequired,
-  onChange: PropTypes.func.isRequired,
-  attribute: PropTypes.object.isRequired,
-  name: PropTypes.string.isRequired,
-  description: PropTypes.object,
-  disabled: PropTypes.bool,
-  error: PropTypes.string,
-  labelAction: PropTypes.object,
-  required: PropTypes.bool,
-  value: PropTypes.string,
-};
-
-export default ColorPickerInput;

package/admin/src/components/tests/__snapshots__/color-picker-input.test.js.snap

@@ -1,238 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<ColorPickerInput /> renders and matches the snapshot 1`] = `
-.c9 {
-  border: 0;
-  -webkit-clip: rect(0 0 0 0);
-  clip: rect(0 0 0 0);
-  height: 1px;
-  margin: -1px;
-  overflow: hidden;
-  padding: 0;
-  position: absolute;
-  width: 1px;
-}
-
-.c1 {
-  font-size: 0.75rem;
-  line-height: 1.33;
-  font-weight: 600;
-  color: #32324d;
-}
-
-.c8 {
-  font-size: 0.875rem;
-  line-height: 1.43;
-  color: #666687;
-}
-
-.c3 {
-  background: #ffffff;
-  padding: 8px;
-  border-radius: 4px;
-  border-color: #dcdce4;
-  border: 1px solid #dcdce4;
-  cursor: pointer;
-}
-
-.c0 {
-  -webkit-align-items: stretch;
-  -webkit-box-align: stretch;
-  -ms-flex-align: stretch;
-  align-items: stretch;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  gap: 4px;
-}
-
-.c4 {
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: row;
-  -ms-flex-direction: row;
-  flex-direction: row;
-}
-
-.c5 {
-  position: relative;
-  outline: none;
-}
-
-.c5 > svg {
-  height: 12px;
-  width: 12px;
-}
-
-.c5 > svg > g,
-.c5 > svg path {
-  fill: #ffffff;
-}
-
-.c5[aria-disabled='true'] {
-  pointer-events: none;
-}
-
-.c5:after {
-  -webkit-transition-property: all;
-  transition-property: all;
-  -webkit-transition-duration: 0.2s;
-  transition-duration: 0.2s;
-  border-radius: 8px;
-  content: '';
-  position: absolute;
-  top: -4px;
-  bottom: -4px;
-  left: -4px;
-  right: -4px;
-  border: 2px solid transparent;
-}
-
-.c5:focus-visible {
-  outline: none;
-}
-
-.c5:focus-visible:after {
-  border-radius: 8px;
-  content: '';
-  position: absolute;
-  top: -5px;
-  bottom: -5px;
-  left: -5px;
-  right: -5px;
-  border: 2px solid #4945ff;
-}
-
-.c2 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-}
-
-.c7 {
-  border-radius: 50%;
-  width: 20px;
-  height: 20px;
-  margin-right: 10px;
-  background-color: #000000;
-  border: 1px solid rgba(0,0,0,0.1);
-}
-
-.c6 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-pack: justify;
-  -webkit-justify-content: space-between;
-  -ms-flex-pack: justify;
-  justify-content: space-between;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-}
-
-.c6 svg {
-  width: 8px;
-  height: 8px;
-}
-
-.c6 svg > path {
-  fill: #8e8ea9;
-  justify-self: flex-end;
-}
-
-<div>
-  <div
-    class=""
-  >
-    <div
-      class="c0"
-    >
-      <label
-        class="c1 c2"
-        for="color"
-      >
-        color-picker
-      </label>
-      <button
-        aria-controls="color-picker-value"
-        aria-disabled="false"
-        aria-expanded="false"
-        aria-haspopup="dialog"
-        aria-label="Color picker toggle"
-        class="c3 c4 c5 c6"
-        type="button"
-      >
-        <div
-          class="c4"
-        >
-          <div
-            class="c7"
-            color="#000000"
-          />
-          <span
-            class="c8"
-            style="text-transform: uppercase;"
-          >
-            #000000
-          </span>
-        </div>
-        <svg
-          aria-hidden="true"
-          fill="none"
-          height="1rem"
-          viewBox="0 0 14 8"
-          width="1rem"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            clip-rule="evenodd"
-            d="M14 .889a.86.86 0 0 1-.26.625L7.615 7.736A.834.834 0 0 1 7 8a.834.834 0 0 1-.615-.264L.26 1.514A.861.861 0 0 1 0 .889c0-.24.087-.45.26-.625A.834.834 0 0 1 .875 0h12.25c.237 0 .442.088.615.264a.86.86 0 0 1 .26.625Z"
-            fill="#32324D"
-            fill-rule="evenodd"
-          />
-        </svg>
-      </button>
-    </div>
-  </div>
-  <div
-    class="c9"
-  >
-    <p
-      aria-live="polite"
-      aria-relevant="all"
-      id="live-region-log"
-      role="log"
-    />
-    <p
-      aria-live="polite"
-      aria-relevant="all"
-      id="live-region-status"
-      role="status"
-    />
-    <p
-      aria-live="assertive"
-      aria-relevant="all"
-      id="live-region-alert"
-      role="alert"
-    />
-  </div>
-</div>
-`;

package/admin/src/components/tests/color-picker-input.test.js

@@ -1,65 +0,0 @@
-import React from 'react';
-
-import { lightTheme, ThemeProvider } from '@strapi/design-system';
-import { fireEvent, render, screen } from '@testing-library/react';
-import { IntlProvider } from 'react-intl';
-
-import ColorPickerInput from '../ColorPicker/ColorPickerInput';
-
-const mockAttribute = {
-  customField: 'plugin::color-picker.color',
-  pluginOptions: { i18n: { localized: true } },
-  type: 'string',
-};
-
-const App = (
-  <IntlProvider locale="en" messages={{}} textComponent="span">
-    <ThemeProvider theme={lightTheme}>
-      <ColorPickerInput
-        name="color"
-        value=""
-        onChange={jest.fn()}
-        attribute={mockAttribute}
-        intlLabel={{ id: 'color-picker', defaultMessage: 'color-picker' }}
-      />
-    </ThemeProvider>
-  </IntlProvider>
-);
-
-describe('<ColorPickerInput />', () => {
-  /**
-   * We do this because –
-   * https://github.com/facebook/jest/issues/12670
-   */
-  beforeAll(() => {
-    jest.setTimeout(30000);
-  });
-
-  /**
-   * Reset timeout to what is expected
-   */
-  afterAll(() => {
-    jest.setTimeout(5000);
-  });
-
-  it('renders and matches the snapshot', () => {
-    const { container } = render(App);
-
-    expect(container).toMatchSnapshot();
-  });
-
-  it('toggles the popover', () => {
-    render(App);
-    const colorPickerToggle = screen.getByRole('button', { name: 'Color picker toggle' });
-    fireEvent.click(colorPickerToggle);
-
-    const popover = screen.getByRole('dialog');
-    const saturation = screen.getByRole('slider', { name: 'Color' });
-    const hue = screen.getByRole('slider', { name: 'Hue' });
-    const input = screen.getByRole('textbox', { name: 'Color picker input' });
-    expect(popover).toBeVisible();
-    expect(saturation).toBeVisible();
-    expect(hue).toBeVisible();
-    expect(input).toBeVisible();
-  });
-});