Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

deps: drop react-beautiful-dnd (#64713)

Uladzimir Havenchykc7fb07c3871a
diff --git a/e2e/support/helpers/e2e-dragndrop-helpers.js b/e2e/support/helpers/e2e-dragndrop-helpers.js
index 9c7224af20c..ba3d8f2cf82 100644
--- a/e2e/support/helpers/e2e-dragndrop-helpers.js
+++ b/e2e/support/helpers/e2e-dragndrop-helpers.js
@@ -1,45 +1,3 @@
-// Rely on native drag events, rather than on the coordinates
-// We have 3 "drag-handles" in this test. Their indexes are 0-based.
-export function dragField(startIndex, dropIndex) {
- cy.get(".Icon-grabber").should("be.visible").as("dragHandle");
-
- const BUTTON_INDEX = 0;
- const SLOPPY_CLICK_THRESHOLD = 10;
- // eslint-disable-next-line no-unsafe-element-filtering
- cy.get("@dragHandle")
- .eq(dropIndex)
- .then(($target) => {
- const coordsDrop = $target[0].getBoundingClientRect();
- // eslint-disable-next-line no-unsafe-element-filtering
- cy.get("@dragHandle")
- .eq(startIndex)
- .then((subject) => {
- const coordsDrag = subject[0].getBoundingClientRect();
- cy.wrap(subject)
- .trigger("mousedown", {
- button: BUTTON_INDEX,
- clientX: coordsDrag.x,
- clientY: coordsDrag.y,
- force: true,
- })
- .trigger("mousemove", {
- button: BUTTON_INDEX,
- clientX: coordsDrag.x + SLOPPY_CLICK_THRESHOLD,
- clientY: coordsDrag.y,
- force: true,
- });
- cy.get("body")
- .trigger("mousemove", {
- button: BUTTON_INDEX,
- clientX: coordsDrop.x,
- clientY: coordsDrop.y,
- force: true,
- })
- .trigger("mouseup");
- });
- });
-}
-
export function dragAndDrop(subjectAlias, targetAlias) {
const dataTransfer = new DataTransfer();
diff --git a/e2e/test/scenarios/actions/actions-on-dashboards.cy.spec.js b/e2e/test/scenarios/actions/actions-on-dashboards.cy.spec.js
index 0c05aa4a9c5..c8cb9b0649a 100644
--- a/e2e/test/scenarios/actions/actions-on-dashboards.cy.spec.js
+++ b/e2e/test/scenarios/actions/actions-on-dashboards.cy.spec.js
@@ -99,7 +99,10 @@ const MODEL_NAME = "Test Action Model";
});
// can't have this in the .within() because it needs access to document.body
- reorderFields();
+ H.moveDnDKitListElement("drag-handle", {
+ startIndex: 1,
+ dropIndex: 0,
+ });
cy.findByRole("dialog").within(() => {
cy.findAllByText("Number").each((el) => {
@@ -124,7 +127,6 @@ const MODEL_NAME = "Test Action Model";
addWidgetStringFilter("1");
cy.findByRole("button", { name: "Update Score" }).click();
-
cy.findByRole("dialog").within(() => {
cy.findByLabelText("New Score").type("55");
cy.button(ACTION_NAME).click();
@@ -440,7 +442,10 @@ const MODEL_NAME = "Test Action Model";
);
});
- reorderFields();
+ H.moveDnDKitListElement("drag-handle", {
+ startIndex: 1,
+ dropIndex: 0,
+ });
cy.findByRole("dialog").within(() => {
cy.findAllByText("Number").each((el) => {
@@ -1353,10 +1358,6 @@ function toggleFieldVisibility() {
cy.findByText("Show field").click();
}
-function reorderFields() {
- H.dragField(1, 0);
-}
-
const clickHelper = (buttonName) => {
// this is dirty, but it seems to be the only reliable solution to detached elements before cypress v12
// https://github.com/cypress-io/cypress/issues/7306
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormCreator.tsx b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormCreator.tsx
index 680c4015e48..015ab944efb 100644
--- a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormCreator.tsx
+++ b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormCreator.tsx
@@ -1,14 +1,13 @@
+import { PointerSensor, useSensor } from "@dnd-kit/core";
import { useCallback, useEffect, useMemo, useState } from "react";
-import type {
- DraggableProvided,
- DropResult,
- DroppableProvided,
-} from "react-beautiful-dnd";
-import { Draggable, Droppable } from "react-beautiful-dnd";
import { t } from "ttag";
import _ from "underscore";
-import { DragDropContext } from "metabase/common/components/DragDropContext";
+import type {
+ DragEndEvent,
+ RenderItemProps,
+} from "metabase/common/components/Sortable";
+import { Sortable, SortableList } from "metabase/common/components/Sortable";
import { Form, FormProvider } from "metabase/forms";
import SidebarContent from "metabase/query_builder/components/SidebarContent";
import { Flex, Icon, UnstyledButton } from "metabase/ui";
@@ -56,6 +55,10 @@ export function FormCreator({
onChange,
onClose,
}: FormCreatorProps) {
+ const pointerSensor = useSensor(PointerSensor, {
+ activationConstraint: { distance: 5 },
+ });
+
const [formSettings, setFormSettings] = useState<ActionFormSettings>(
passedFormSettings?.fields ? passedFormSettings : getDefaultFormSettings(),
);
@@ -88,26 +91,28 @@ export function FormCreator({
[validationSchema],
);
- const handleDragEnd = useCallback(
- ({ source, destination }: DropResult) => {
+ const handleSortEnd = useCallback(
+ ({ id, newIndex }: DragEndEvent) => {
if (!formSettings.fields) {
return;
}
- const oldOrder = source.index;
- const newOrder = destination?.index ?? source.index;
+ const oldIndex = form.fields.findIndex((field) => field.name === id);
+ if (oldIndex === -1) {
+ return;
+ }
const reorderedFields = reorderFields(
formSettings.fields,
- oldOrder,
- newOrder,
+ oldIndex,
+ newIndex,
);
setFormSettings({
...formSettings,
fields: reorderedFields,
});
},
- [formSettings],
+ [form.fields, formSettings],
);
const handleChangeFieldSettings = useCallback(
@@ -127,6 +132,32 @@ export function FormCreator({
[formSettings],
);
+ const fieldSettings = formSettings.fields || {};
+
+ const renderItem = ({
+ item: field,
+ id,
+ }: RenderItemProps<(typeof form.fields)[number]>) => (
+ <Sortable
+ key={id}
+ id={id}
+ disabled={!isEditable}
+ as={FormFieldEditorDragContainer}
+ draggingStyle={{ opacity: 0.5 }}
+ >
+ {({ dragHandleRef, dragHandleListeners }) => (
+ <FormFieldEditor
+ field={field}
+ fieldSettings={fieldSettings[field.name]}
+ isEditable={isEditable}
+ onChange={handleChangeFieldSettings}
+ dragHandleRef={dragHandleRef}
+ dragHandleListeners={dragHandleListeners}
+ />
+ )}
+ </Sortable>
+ );
+
if (!parameters.length) {
return (
<SidebarContent>
@@ -151,8 +182,6 @@ export function FormCreator({
);
}
- const fieldSettings = formSettings.fields || {};
-
const showWarning = form.fields.some((field) => {
const settings = fieldSettings[field.name];
@@ -189,37 +218,13 @@ export function FormCreator({
onSubmit={ON_SUBMIT_NOOP}
>
<Form role="form" data-testid="action-form-editor">
- <DragDropContext onDragEnd={handleDragEnd}>
- <Droppable droppableId="action-form-droppable">
- {(provided: DroppableProvided) => (
- <div {...provided.droppableProps} ref={provided.innerRef}>
- {form.fields.map((field, index) => (
- <Draggable
- key={`draggable-${field.name}`}
- draggableId={field.name}
- isDragDisabled={!isEditable}
- index={index}
- >
- {(provided: DraggableProvided) => (
- <FormFieldEditorDragContainer
- ref={provided.innerRef}
- {...provided.draggableProps}
- {...provided.dragHandleProps}
- >
- <FormFieldEditor
- field={field}
- fieldSettings={fieldSettings[field.name]}
- isEditable={isEditable}
- onChange={handleChangeFieldSettings}
- />
- </FormFieldEditorDragContainer>
- )}
- </Draggable>
- ))}
- </div>
- )}
- </Droppable>
- </DragDropContext>
+ <SortableList
+ items={form.fields}
+ getId={(field) => field.name}
+ renderItem={renderItem}
+ onSortEnd={handleSortEnd}
+ sensors={[pointerSensor]}
+ />
</Form>
</FormProvider>
</FormContainer>
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/DragHandle.module.css b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/DragHandle.module.css
new file mode 100644
index 00000000000..3f7dc36e920
--- /dev/null
+++ b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/DragHandle.module.css
@@ -0,0 +1,9 @@
+.dragHandle {
+ color: var(--mb-color-text-medium);
+ margin-top: 4px;
+ cursor: grab;
+}
+
+.dragHandle:active {
+ cursor: grabbing;
+}
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/DragHandle.tsx b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/DragHandle.tsx
new file mode 100644
index 00000000000..3cbf5c10ca8
--- /dev/null
+++ b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/DragHandle.tsx
@@ -0,0 +1,28 @@
+import type { SyntheticListenerMap } from "@dnd-kit/core/dist/hooks/utilities";
+import type { MutableRefObject } from "react";
+import { forwardRef } from "react";
+
+import { Icon } from "metabase/ui";
+
+import styles from "./DragHandle.module.css";
+
+interface DragHandleProps {
+ dragHandleListeners: SyntheticListenerMap | undefined;
+}
+
+const DRAG_HANDLE_SIZE = 12;
+
+export const DragHandle = forwardRef<HTMLElement, DragHandleProps>(
+ function DragHandle({ dragHandleListeners }, ref) {
+ return (
+ <div
+ data-testid="drag-handle"
+ ref={ref as MutableRefObject<HTMLDivElement>}
+ className={styles.dragHandle}
+ {...dragHandleListeners}
+ >
+ <Icon name="grabber" size={DRAG_HANDLE_SIZE} />
+ </div>
+ );
+ },
+);
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/FormFieldEditor.styled.tsx b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/FormFieldEditor.styled.tsx
index d2cf2124c57..f226ad5d24d 100644
--- a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/FormFieldEditor.styled.tsx
+++ b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/FormFieldEditor.styled.tsx
@@ -1,13 +1,9 @@
// eslint-disable-next-line no-restricted-imports
import styled from "@emotion/styled";
-import { forwardRef } from "react";
import FormField from "metabase/common/components/FormField";
import Radio from "metabase/common/components/Radio";
import { darken } from "metabase/lib/colors";
-import { Icon, type IconProps } from "metabase/ui";
-
-const DRAG_HANDLE_SIZE = 12;
export const FormFieldContainer = styled.div`
background-color: var(--mb-color-bg-white);
@@ -39,7 +35,6 @@ export const Column = styled.div<{ full?: boolean }>`
display: flex;
flex-direction: column;
flex: ${(props) => (props.full ? 1 : "unset")};
- min-width: ${DRAG_HANDLE_SIZE}px;
`;
export const Header = styled.div`
@@ -60,15 +55,6 @@ export const Subtitle = styled.div`
margin-top: 1.2rem;
`;
-export const DragHandle = styled(
- forwardRef<SVGSVGElement, IconProps>(function DragHandle(props, ref) {
- return <Icon {...props} size={props.size ?? DRAG_HANDLE_SIZE} ref={ref} />;
- }),
-)`
- color: var(--mb-color-text-medium);
- margin-top: 4px;
-`;
-
export const PreviewContainer = styled(ContentContainer)`
background-color: var(--mb-color-bg-light);
border-top: 1px solid ${() => darken("bg-light", 0.1)};
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/FormFieldEditor.tsx b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/FormFieldEditor.tsx
index a7256afd52b..cb0dcdb8a51 100644
--- a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/FormFieldEditor.tsx
+++ b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/FormFieldEditor.tsx
@@ -1,3 +1,5 @@
+import type { SyntheticListenerMap } from "@dnd-kit/core/dist/hooks/utilities";
+import type { MutableRefObject } from "react";
import { useMemo } from "react";
import { t } from "ttag";
@@ -16,9 +18,9 @@ import type {
import { FieldSettingsButtons } from "../FieldSettingsButtons";
+import { DragHandle } from "./DragHandle";
import {
Column,
- DragHandle,
EditorContainer,
FormFieldContainer,
Header,
@@ -33,6 +35,8 @@ export interface FormFieldEditorProps {
fieldSettings: FieldSettings;
isEditable: boolean;
onChange: (settings: FieldSettings) => void;
+ dragHandleRef?: MutableRefObject<HTMLElement | null>;
+ dragHandleListeners?: SyntheticListenerMap | undefined;
}
function cleanFieldValue(
@@ -62,6 +66,8 @@ function FormFieldEditor({
fieldSettings,
isEditable,
onChange,
+ dragHandleRef,
+ dragHandleListeners,
}: FormFieldEditorProps) {
const fieldTypeOptions = useMemo(getFieldTypes, []);
const inputTypeOptions = useMemo(getInputTypes, []);
@@ -100,7 +106,14 @@ function FormFieldEditor({
return (
<FormFieldContainer data-testid="form-field-container">
<EditorContainer>
- <Column>{isEditable && <DragHandle name="grabber" />}</Column>
+ <Column>
+ {isEditable && (
+ <DragHandle
+ ref={dragHandleRef}
+ dragHandleListeners={dragHandleListeners}
+ />
+ )}
+ </Column>
<Column full>
<Header>
<Title>{field.title}</Title>
diff --git a/frontend/src/metabase/common/components/DragDropContext/DragDropContext.tsx b/frontend/src/metabase/common/components/DragDropContext/DragDropContext.tsx
deleted file mode 100644
index eabb1d10a41..00000000000
--- a/frontend/src/metabase/common/components/DragDropContext/DragDropContext.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-// eslint-disable-next-line no-restricted-imports
-import { withEmotionCache } from "@emotion/react";
-import type { DragDropContextProps } from "react-beautiful-dnd";
-import { DragDropContext as ReactDragDropContext } from "react-beautiful-dnd";
-
-export const DragDropContext = withEmotionCache(
- ({ children, ...props }: DragDropContextProps, cache) => {
- return (
- <ReactDragDropContext {...props} nonce={cache.nonce}>
- {children}
- </ReactDragDropContext>
- );
- },
-);
diff --git a/frontend/src/metabase/common/components/DragDropContext/index.ts b/frontend/src/metabase/common/components/DragDropContext/index.ts
deleted file mode 100644
index be12be37647..00000000000
--- a/frontend/src/metabase/common/components/DragDropContext/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { DragDropContext } from "./DragDropContext";
diff --git a/package.json b/package.json
index fe724152029..c252c75334d 100644
--- a/package.json
+++ b/package.json
@@ -110,7 +110,6 @@
"re-reselect": "^4.0.1",
"react": "^18.2.0",
"react-ansi-style": "^1.0.0",
- "react-beautiful-dnd": "^13.1.1",
"react-color": "^2.14.1",
"react-copy-to-clipboard": "^5.0.1",
"react-dnd": "4",
@@ -232,7 +231,6 @@
"@types/prop-types": "^15.7.4",
"@types/raf": "^3.4.0",
"@types/react": "^18.3.3",
- "@types/react-beautiful-dnd": "^13.1.3",
"@types/react-color": "^2.17.6",
"@types/react-copy-to-clipboard": "^5.0.2",
"@types/react-dom": "^18.2.17",
diff --git a/yarn.lock b/yarn.lock
index 610862e452b..26c2d416430 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5247,14 +5247,6 @@
resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.11.tgz#56588b17ae8f50c53983a524fc3cc47437969d64"
integrity sha512-qjDJRrmvBMiTx+jyLxvLfJU7UznFuokDv4f3WRuriHKERccVpFU+8XMQUAbDzoiJCsmexxRExQeMwwCdamSKDA==
-"@types/hoist-non-react-statics@^3.3.0":
- version "3.3.1"
- resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz#1124aafe5118cb591977aeb1ceaaed1070eb039f"
- integrity sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==
- dependencies:
- "@types/react" "*"
- hoist-non-react-statics "^3.3.0"
-
"@types/hoist-non-react-statics@^3.3.1":
version "3.3.7"
resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.7.tgz#306e3a3a73828522efa1341159da4846e7573a6c"
@@ -5609,13 +5601,6 @@
resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc"
integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==
-"@types/react-beautiful-dnd@^13.1.3":
- version "13.1.3"
- resolved "https://registry.yarnpkg.com/@types/react-beautiful-dnd/-/react-beautiful-dnd-13.1.3.tgz#9812f6086c4b77ce08c83120788d92084a26db0f"
- integrity sha512-BNdmvONKtsrZq3AGrujECQrIn8cDT+fZsxBLXuX3YWY/nHfZinUFx4W88eS0rkcXzuLbXpKOsu/1WCMPMLEpPg==
- dependencies:
- "@types/react" "*"
-
"@types/react-color@^2.17.6":
version "2.17.6"
resolved "https://registry.yarnpkg.com/@types/react-color/-/react-color-2.17.6.tgz#584946f17c40fcd0828fde5f72a9c23ccea6f037"
@@ -5652,16 +5637,6 @@
dependencies:
"@types/react" "*"
-"@types/react-redux@^7.1.20":
- version "7.1.24"
- resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.24.tgz#6caaff1603aba17b27d20f8ad073e4c077e975c0"
- integrity sha512-7FkurKcS1k0FHZEtdbbgN8Oc6b+stGSfZYjQGicofJ0j4U0qIn/jaSvnP2pLwZKiai3/17xqqxkkrxTgN8UNbQ==
- dependencies:
- "@types/hoist-non-react-statics" "^3.3.0"
- "@types/react" "*"
- hoist-non-react-statics "^3.3.0"
- redux "^4.0.0"
-
"@types/react-resizable@^3.0.4":
version "3.0.4"
resolved "https://registry.yarnpkg.com/@types/react-resizable/-/react-resizable-3.0.4.tgz#2f5a1b6c79dd0b8729959deefc8628ab484724cc"
@@ -8878,13 +8853,6 @@ css-blank-pseudo@^7.0.1:
dependencies:
postcss-selector-parser "^7.0.0"
-css-box-model@^1.2.0:
- version "1.2.1"
- resolved "https://registry.yarnpkg.com/css-box-model/-/css-box-model-1.2.1.tgz#59951d3b81fd6b2074a62d49444415b0d2b4d7c1"
- integrity sha512-a7Vr4Q/kd/aw96bnJG332W9V9LkJO69JRcaCYDUqjp6/z0w6VcZjgAcTbgFxEPfBgdnAwlh3iwu+hLopa+flJw==
- dependencies:
- tiny-invariant "^1.0.6"
-
css-functions-list@^3.2.3:
version "3.2.3"
resolved "https://registry.yarnpkg.com/css-functions-list/-/css-functions-list-3.2.3.tgz#95652b0c24f0f59b291a9fc386041a19d4f40dbe"
@@ -15152,11 +15120,6 @@ memfs@^3.4.1, memfs@^3.4.3:
dependencies:
fs-monkey "^1.0.4"
-memoize-one@^5.1.1:
- version "5.2.1"
- resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.2.1.tgz#8337aa3c4335581839ec01c3d594090cebe8f00e"
- integrity sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==
-
memoizerific@^1.11.3:
version "1.11.3"
resolved "https://registry.yarnpkg.com/memoizerific/-/memoizerific-1.11.3.tgz#7c87a4646444c32d75438570905f2dbd1b1a805a"
@@ -17925,11 +17888,6 @@ quote-unquote@^1.0.0:
resolved "https://registry.yarnpkg.com/quote-unquote/-/quote-unquote-1.0.0.tgz#67a9a77148effeaf81a4d428404a710baaac8a0b"
integrity sha512-twwRO/ilhlG/FIgYeKGFqyHhoEhqgnKVkcmqMKi2r524gz3ZbDTcyFt38E9xjJI2vT+KbRNHVbnJ/e0I25Azwg==
-raf-schd@^4.0.2:
- version "4.0.3"
- resolved "https://registry.yarnpkg.com/raf-schd/-/raf-schd-4.0.3.tgz#5d6c34ef46f8b2a0e880a8fcdb743efc5bfdbc1a"
- integrity sha512-tQkJl2GRWh83ui2DiPTJz9wEiMN20syf+5oKfB03yYP7ioZcJwsIK8FjrtLwH1m7C7e+Tt2yYBlrOpdT+dyeIQ==
-
raf@^3.4.0, raf@^3.4.1:
version "3.4.1"
resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.1.tgz#0742e99a4a6552f445d73e3ee0328af0ff1ede39"
@@ -18013,19 +17971,6 @@ react-ansi-style@^1.0.0:
ansi-style-parser "^1.0.1"
js-managed-css "^1.4.1"
-react-beautiful-dnd@^13.1.1:
- version "13.1.1"
- resolved "https://registry.yarnpkg.com/react-beautiful-dnd/-/react-beautiful-dnd-13.1.1.tgz#b0f3087a5840920abf8bb2325f1ffa46d8c4d0a2"
- integrity sha512-0Lvs4tq2VcrEjEgDXHjT98r+63drkKEgqyxdA7qD3mvKwga6a5SscbdLPO2IExotU1jW8L0Ksdl0Cj2AF67nPQ==
- dependencies:
- "@babel/runtime" "^7.9.2"
- css-box-model "^1.2.0"
- memoize-one "^5.1.1"
- raf-schd "^4.0.2"
- react-redux "^7.2.0"
- redux "^4.0.4"
- use-memo-one "^1.1.1"
-
react-color@^2.14.1:
version "2.18.1"
resolved "https://registry.yarnpkg.com/react-color/-/react-color-2.18.1.tgz#2cda8cc8e06a9e2c52ad391a30ddad31972472f4"
@@ -18182,11 +18127,6 @@ react-is@^17.0.1:
resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339"
integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA==
-react-is@^17.0.2:
- version "17.0.2"
- resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
- integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
-
react-is@^18.0.0, react-is@^18.2.0:
version "18.2.0"
resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b"
@@ -18232,18 +18172,6 @@ react-reconciler@^0.26.2:
object-assign "^4.1.1"
scheduler "^0.20.2"
-react-redux@^7.2.0:
- version "7.2.8"
- resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.8.tgz#a894068315e65de5b1b68899f9c6ee0923dd28de"
- integrity sha512-6+uDjhs3PSIclqoCk0kd6iX74gzrGc3W5zcAjbrFgEdIjRSQObdIwfx80unTkVUYvbQ95Y8Av3OvFHq1w5EOUw==
- dependencies:
- "@babel/runtime" "^7.15.4"
- "@types/react-redux" "^7.1.20"
- hoist-non-react-statics "^3.3.2"
- loose-envify "^1.4.0"
- prop-types "^15.7.2"
- react-is "^17.0.2"
-
react-redux@^9.1.2:
version "9.1.2"
resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-9.1.2.tgz#deba38c64c3403e9abd0c3fbeab69ffd9d8a7e4b"
@@ -18625,7 +18553,7 @@ redux@^3.6.0, redux@^3.7.2:
loose-envify "^1.1.0"
symbol-observable "^1.0.3"
-redux@^4.0.0, redux@^4.0.4:
+redux@^4.0.0:
version "4.2.0"
resolved "https://registry.yarnpkg.com/redux/-/redux-4.2.0.tgz#46f10d6e29b6666df758780437651eeb2b969f13"
integrity sha512-oSBmcKKIuIR4ME29/AeNUnl5L+hvBq7OaJWzaptTQJAntaPvxIJqfnjbaEiCzzaIz+XmVILfqAM3Ob0aXLPfjA==
@@ -20720,11 +20648,6 @@ timers-browserify@^2.0.4:
dependencies:
setimmediate "^1.0.4"
-tiny-invariant@^1.0.6:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.2.0.tgz#a1141f86b672a9148c72e978a19a73b9b94a15a9"
- integrity sha512-1Uhn/aqw5C6RI4KejVeTg6mIS7IqxnLJ8Mv2tV5rTc0qWobay7pDUz6Wi392Cnc8ak1H0F2cjoRzb2/AW4+Fvg==
-
tiny-invariant@^1.2.0:
version "1.3.1"
resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.3.1.tgz#8560808c916ef02ecfd55e66090df23a4b7aa642"
@@ -21626,11 +21549,6 @@ use-latest@^1.2.1:
dependencies:
use-isomorphic-layout-effect "^1.1.1"
-use-memo-one@^1.1.1:
- version "1.1.3"
- resolved "https://registry.yarnpkg.com/use-memo-one/-/use-memo-one-1.1.3.tgz#2fd2e43a2169eabc7496960ace8c79efef975e99"
- integrity sha512-g66/K7ZQGYrI6dy8GLpVcMsBp4s17xNkYJVSMvTEevGy3nDxHOfE6z8BVE22+5G5x7t3+bhzrlTDB7ObrEE0cQ==
-
use-sidecar@^1.1.3:
version "1.1.3"
resolved "https://registry.yarnpkg.com/use-sidecar/-/use-sidecar-1.1.3.tgz#10e7fd897d130b896e2c546c63a5e8233d00efdb"