feat: export "connect" HOC (#344)

packages/webiny-app-cms/src/editor/components/ConnectedElement.js

@@ -1,6 +1,6 @@
 // @flow
 import { isEqual } from "lodash";
-import { connect } from "react-redux";
+import { connect } from "webiny-app-cms/editor/redux";
 import { getElement } from "webiny-app-cms/editor/selectors";
 
 export default connect(

packages/webiny-app-cms/src/editor/components/ConnectedSlate.js

@@ -2,7 +2,7 @@
 import * as React from "react";
 import { pure } from "recompose";
 import { get } from "lodash";
-import { connect } from "react-redux";
+import { connect } from "webiny-app-cms/editor/redux";
 import { isEqual } from "lodash";
 import { getElement } from "webiny-app-cms/editor/selectors";
 import Slate from "./Slate";

packages/webiny-app-cms/src/editor/components/DropZone/Center.js

@@ -2,7 +2,7 @@
 import * as React from "react";
 import styled from "react-emotion";
 import { getElementProps } from "webiny-app-cms/editor/selectors";
-import { connect } from "react-redux";
+import { connect } from "webiny-app-cms/editor/redux";
 import { pure } from "recompose";
 import Droppable from "./../Droppable";
 

packages/webiny-app-cms/src/editor/components/Droppable.js

@@ -1,7 +1,8 @@
+// @flow
 import React from "react";
 import { DropTarget } from "react-dnd";
 import { compose, pure } from "recompose";
-import { connect } from "react-redux";
+import { connect } from "webiny-app-cms/editor/redux";
 import { getIsDragging } from "webiny-app-cms/editor/selectors";
 
 const defaultVisibility = ({ type, isDragging, item }) => {

packages/webiny-app-cms/src/editor/components/Editor/Bar.js

@@ -1,6 +1,6 @@
 // @flow
 import React from "react";
-import { connect } from "react-redux";
+import { connect } from "webiny-app-cms/editor/redux";
 import { pure } from "recompose";
 import { getPlugins } from "webiny-plugins";
 import { getUi } from "webiny-app-cms/editor/selectors";

packages/webiny-app-cms/src/editor/components/Editor/Content.js

@@ -1,7 +1,7 @@
 // @flow
 import React from "react";
 import { get } from "dot-prop-immutable";
-import { connect } from "react-redux";
+import { connect } from "webiny-app-cms/editor/redux";
 import styled from "react-emotion";
 import { css } from "emotion";
 import { compose } from "recompose";

packages/webiny-app-cms/src/editor/components/Editor/Editor.js

@@ -1,6 +1,6 @@
 // @flow
 import React from "react";
-import { connect } from "react-redux";
+import { connect } from "webiny-app-cms/editor/redux";
 import classSet from "classnames";
 import { ActionCreators } from "redux-undo";
 import HTML5Backend from "react-dnd-html5-backend";

packages/webiny-app-cms/src/editor/components/Editor/Toolbar.js

@@ -1,6 +1,6 @@
 //@flow
 import React from "react";
-import { connect } from "react-redux";
+import { connect } from "webiny-app-cms/editor/redux";
 import styled from "react-emotion";
 import { css } from "emotion";
 import { isEqual } from "lodash";

packages/webiny-app-cms/src/editor/components/Element.js

@@ -2,7 +2,7 @@
 import * as React from "react";
 import { Transition } from "react-transition-group";
 import { compose, pure, withHandlers, withProps, setDisplayName } from "recompose";
-import { connect } from "react-redux";
+import { connect } from "webiny-app-cms/editor/redux";
 import isEqual from "lodash/isEqual";
 import { getPlugin } from "webiny-plugins";
 import { renderPlugins } from "webiny-app/plugins";

packages/webiny-app-cms/src/editor/components/OEmbed.js

@@ -1,6 +1,6 @@
 // @flow
 import * as React from "react";
-import { connect } from "react-redux";
+import { connect } from "webiny-app-cms/editor/redux";
 import { css } from "emotion";
 import { isEqual } from "lodash";
 import { compose, withHandlers, shouldUpdate, lifecycle } from "recompose";
@@ -98,30 +98,33 @@ export default compose(
         }
     }),
     withHandlers({
-        renderEmpty: () => () => {
-            return <div>You must configure your embed in the settings!</div>;
-        },
-        renderEmbed: ({ renderEmbed, ...props }) => () => {
-            if (typeof renderEmbed === "function") {
-                return renderEmbed(props);
-            }
+        renderEmpty: () =>
+            function renderEmpty() {
+                return <div>You must configure your embed in the settings!</div>;
+            },
+        renderEmbed: ({ renderEmbed, ...props }) =>
+            function embedRenderer() {
+                if (typeof renderEmbed === "function") {
+                    return renderEmbed(props);
+                }
 
-            const { element, data } = props;
+                const { element, data } = props;
 
-            if (data && data.loading) {
-                return "Loading embed data...";
-            }
+                if (data && data.loading) {
+                    return "Loading embed data...";
+                }
 
-            return (
-                <div
-                    id={element.id}
-                    className={
-                        centerAlign + " cms-editor-dragging--disabled cms-editor-resizing--disabled"
-                    }
-                    dangerouslySetInnerHTML={{ __html: get(element, "data.oembed.html") || "" }}
-                />
-            );
-        }
+                return (
+                    <div
+                        id={element.id}
+                        className={
+                            centerAlign +
+                            " cms-editor-dragging--disabled cms-editor-resizing--disabled"
+                        }
+                        dangerouslySetInnerHTML={{ __html: get(element, "data.oembed.html") || "" }}
+                    />
+                );
+            }
     }),
     lifecycle({
         async componentDidMount() {

packages/webiny-app-cms/src/editor/components/Slate/Slate.js

@@ -2,7 +2,7 @@
 import React from "react";
 import ReactDOM from "react-dom";
 import styled from "react-emotion";
-import { connect } from "react-redux";
+import { connect } from "webiny-app-cms/editor/redux";
 import { compose, pure } from "recompose";
 import { get } from "lodash";
 import { Editor } from "slate-react";

packages/webiny-app-cms/src/editor/components/withActiveElement.js

@@ -1,6 +1,6 @@
 // @flow
 import * as React from "react";
-import { connect } from "react-redux";
+import { connect } from "webiny-app-cms/editor/redux";
 import {
     getActiveElementId,
     getElement,

packages/webiny-app-cms/src/editor/plugins/background/Background.js

@@ -1,5 +1,6 @@
+// @flow
 import React from "react";
-import { connect } from "react-redux";
+import { connect } from "webiny-app-cms/editor/redux";
 import { compose } from "recompose";
 import { withActiveElement } from "webiny-app-cms/editor/components";
 import { highlightElement, deactivateElement } from "webiny-app-cms/editor/actions";

packages/webiny-app-cms/src/editor/plugins/blockEditing/AddBlock.js

@@ -1,6 +1,6 @@
 //@flow
 import React from "react";
-import { connect } from "react-redux";
+import { connect } from "webiny-app-cms/editor/redux";
 import styled from "react-emotion";
 import { togglePlugin } from "webiny-app-cms/editor/actions";
 import { ButtonFloating } from "webiny-ui/Button";

packages/webiny-app-cms/src/editor/plugins/blockEditing/AddContent.js

@@ -1,7 +1,7 @@
 //@flow
 import React from "react";
 import styled, { keyframes } from "react-emotion";
-import { connect } from "react-redux";
+import { connect } from "webiny-app-cms/editor/redux";
 import { pure } from "recompose";
 import { Elevation } from "webiny-ui/Elevation";
 import { ButtonFloating } from "webiny-ui/Button";

packages/webiny-app-cms/src/editor/plugins/blockEditing/SearchBlocks.js

@@ -1,6 +1,6 @@
 //@flow
 import * as React from "react";
-import { connect } from "react-redux";
+import { connect } from "webiny-app-cms/editor/redux";
 import { compose } from "recompose";
 import { Tabs, Tab } from "webiny-ui/Tabs";
 import { Icon } from "webiny-ui/Icon";

packages/webiny-app-cms/src/editor/plugins/defaultBar/components/PageSettings.js

@@ -1,6 +1,6 @@
 //@flow
 import React from "react";
-import { connect } from "react-redux";
+import { connect } from "webiny-app-cms/editor/redux";
 import { compose, lifecycle, withHandlers, withState } from "recompose";
 import { omit } from "lodash";
 import { getPlugins } from "webiny-plugins";

packages/webiny-app-cms/src/editor/plugins/defaultBar/components/PageSettingsButton.js

@@ -1,5 +1,6 @@
+// @flow
 import React from "react";
-import { connect } from "react-redux";
+import { connect } from "webiny-app-cms/editor/redux";
 import { togglePlugin } from "webiny-app-cms/editor/actions";
 import { IconButton } from "webiny-ui/Button";
 import { ReactComponent as SettingsIcon } from "./icons/settings.svg";

packages/webiny-app-cms/src/editor/plugins/defaultBar/components/Revisions.js

@@ -1,6 +1,6 @@
 //@flow
 import React from "react";
-import { connect } from "react-redux";
+import { connect } from "webiny-app-cms/editor/redux";
 import { compose, pure } from "recompose";
 import { css } from "emotion";
 import { withRouter } from "webiny-app/components";

packages/webiny-app-cms/src/editor/plugins/defaultBar/components/Title.js

@@ -1,8 +1,7 @@
 //@flow
 import React from "react";
 import { compose, withState, withProps, withHandlers, pure } from "recompose";
-import { get } from "dot-prop-immutable";
-import { connect } from "react-redux";
+import { connect } from "webiny-app-cms/editor/redux";
 import { Input } from "webiny-ui/Input";
 import { updateRevision } from "webiny-app-cms/editor/actions";
 import { getPage } from "webiny-app-cms/editor/selectors";

packages/webiny-app-cms/src/editor/plugins/elementActions/settings/AdvancedSettings.js

@@ -1,6 +1,6 @@
 // @flow
 import * as React from "react";
-import { connect } from "react-redux";
+import { connect } from "webiny-app-cms/editor/redux";
 import { compose, withHandlers } from "recompose";
 import { cloneDeep } from "lodash";
 import { merge } from "dot-prop-immutable";

packages/webiny-app-cms/src/editor/plugins/elementSettings/align/AlignAction.js

@@ -1,6 +1,6 @@
 // @flow
 import * as React from "react";
-import { connect } from "react-redux";
+import { connect } from "webiny-app-cms/editor/redux";
 import { compose, withHandlers, withProps } from "recompose";
 import { getPlugin } from "webiny-plugins";
 import { set } from "dot-prop-immutable";

packages/webiny-app-cms/src/editor/plugins/elementSettings/background/Settings.js

@@ -1,6 +1,6 @@
 //@flow
 import React from "react";
-import { connect } from "react-redux";
+import { connect } from "webiny-app-cms/editor/redux";
 import { compose } from "recompose";
 import { Tabs, Tab } from "webiny-ui/Tabs";
 import { get, set } from "dot-prop-immutable";

packages/webiny-app-cms/src/editor/plugins/elementSettings/bar/ElementSettingsBar.js

@@ -1,6 +1,6 @@
 // @flow
 import React from "react";
-import { connect } from "react-redux";
+import { connect } from "webiny-app-cms/editor/redux";
 import { compose, lifecycle, pure } from "recompose";
 import { TopAppBarSecondary, TopAppBarSection } from "webiny-ui/TopAppBar";
 import { ButtonDefault, ButtonIcon } from "webiny-ui/Button";

packages/webiny-app-cms/src/editor/plugins/elementSettings/bar/components/Menu.js

@@ -1,7 +1,7 @@
 //@flow
 import React from "react";
 import { Transition } from "react-transition-group";
-import { connect } from "react-redux";
+import { connect } from "webiny-app-cms/editor/redux";
 import styled from "react-emotion";
 import { Elevation } from "webiny-ui/Elevation";
 import { togglePlugin } from "webiny-app-cms/editor/actions";

packages/webiny-app-cms/src/editor/plugins/elementSettings/border/Settings.js

@@ -1,6 +1,6 @@
 //@flow
 import * as React from "react";
-import { connect } from "react-redux";
+import { connect } from "webiny-app-cms/editor/redux";
 import { compose, withHandlers } from "recompose";
 import { Tabs, Tab } from "webiny-ui/Tabs";
 import { get, set } from "dot-prop-immutable";

packages/webiny-app-cms/src/editor/plugins/elementSettings/clone/CloneAction.js

@@ -1,6 +1,6 @@
 // @flow
 import * as React from "react";
-import { connect } from "react-redux";
+import { connect } from "webiny-app-cms/editor/redux";
 import { compose, withHandlers } from "recompose";
 import { getPlugin } from "webiny-plugins";
 import { set } from "dot-prop-immutable";

packages/webiny-app-cms/src/editor/plugins/elementSettings/components/Action.js

@@ -1,7 +1,7 @@
 //@flow
 import React from "react";
 import { css } from "emotion";
-import { connect } from "react-redux";
+import { connect } from "webiny-app-cms/editor/redux";
 import { compose, lifecycle, withHandlers } from "recompose";
 import { togglePlugin } from "webiny-app-cms/editor/actions";
 import { IconButton } from "webiny-ui/Button";

packages/webiny-app-cms/src/editor/plugins/elementSettings/components/PMSettings.js

@@ -1,6 +1,6 @@
 //@flow
 import React from "react";
-import { connect } from "react-redux";
+import { connect } from "webiny-app-cms/editor/redux";
 import { compose, withProps, withHandlers } from "recompose";
 import { Tabs, Tab } from "webiny-ui/Tabs";
 import { Grid } from "webiny-ui/Grid";

packages/webiny-app-cms/src/editor/plugins/elementSettings/delete/DeleteAction.js

@@ -1,6 +1,6 @@
 // @flow
 import * as React from "react";
-import { connect } from "react-redux";
+import { connect } from "webiny-app-cms/editor/redux";
 import { compose, withHandlers } from "recompose";
 import { getPlugin } from "webiny-plugins";
 import { deleteElement } from "webiny-app-cms/editor/actions";

packages/webiny-app-cms/src/editor/plugins/elementSettings/height/Settings.js

@@ -1,6 +1,6 @@
 //@flow
 import React from "react";
-import { connect } from "react-redux";
+import { connect } from "webiny-app-cms/editor/redux";
 import { compose } from "recompose";
 import { set } from "dot-prop-immutable";
 

packages/webiny-app-cms/src/editor/plugins/elementSettings/save/SaveAction.js

@@ -1,6 +1,6 @@
 // @flow
 import * as React from "react";
-import { connect } from "react-redux";
+import { connect } from "webiny-app-cms/editor/redux";
 import { compose, withState, withHandlers, lifecycle, shouldUpdate } from "recompose";
 import { graphql } from "react-apollo";
 import { isEqual, cloneDeep } from "lodash";

packages/webiny-app-cms/src/editor/plugins/elementSettings/shadow/Settings.js

@@ -1,6 +1,6 @@
 //@flow
 import React from "react";
-import { connect } from "react-redux";
+import { connect } from "webiny-app-cms/editor/redux";
 import { compose, withHandlers, withProps } from "recompose";
 import { Tabs, Tab } from "webiny-ui/Tabs";
 import { get, set } from "dot-prop-immutable";

packages/webiny-app-cms/src/editor/plugins/elementSettings/width/Settings.js

@@ -1,6 +1,6 @@
 //@flow
 import React from "react";
-import { connect } from "react-redux";
+import { connect } from "webiny-app-cms/editor/redux";
 import { compose } from "recompose";
 import { set } from "dot-prop-immutable";
 

packages/webiny-app-cms/src/editor/plugins/elements/block/BlockContainer.js

@@ -1,6 +1,6 @@
 // @flow
 import * as React from "react";
-import { connect } from "react-redux";
+import { connect } from "webiny-app-cms/editor/redux";
 import { css } from "emotion";
 import { isEqual } from "lodash";
 import Element from "webiny-app-cms/editor/components/Element";

packages/webiny-app-cms/src/editor/plugins/elements/button/ButtonContainer.js

@@ -1,6 +1,6 @@
 // @flow
 import * as React from "react";
-import { connect } from "react-redux";
+import { connect } from "webiny-app-cms/editor/redux";
 import { compose, withHandlers } from "recompose";
 import { get, set } from "dot-prop-immutable";
 import { updateElement } from "webiny-app-cms/editor/actions";

packages/webiny-app-cms/src/editor/plugins/elements/button/ButtonSettings.js

@@ -1,6 +1,6 @@
 // @flow
 import * as React from "react";
-import { connect } from "react-redux";
+import { connect } from "webiny-app-cms/editor/redux";
 import { compose } from "recompose";
 import { set } from "dot-prop-immutable";
 import { get } from "lodash";

packages/webiny-app-cms/src/editor/plugins/elements/button/LinkSettings.js

@@ -1,5 +1,6 @@
+// @flow
 import * as React from "react";
-import { connect } from "react-redux";
+import { connect } from "webiny-app-cms/editor/redux";
 import { compose } from "recompose";
 import { isEqual } from "lodash";
 import { get, merge } from "dot-prop-immutable";
@@ -22,7 +23,7 @@ class LinkSettings extends React.Component<*> {
 
         const newElement = merge(element, attrKey, data);
 
-        updateElement({ element: newElement, history });
+        updateElement({ element: newElement });
 
         if (!isEqual(this.historyUpdated, data)) {
             this.historyUpdated = data;

packages/webiny-app-cms/src/editor/plugins/elements/column/Column.js

@@ -2,8 +2,7 @@
 import React from "react";
 import styled from "react-emotion";
 import { css } from "emotion";
-import { isEqual } from "lodash";
-import { connect } from "react-redux";
+import { connect } from "webiny-app-cms/editor/redux";
 import { compose, withHandlers, pure } from "recompose";
 import { IconButton } from "webiny-ui/Button";
 import { ElementStyle, getElementStyleProps } from "webiny-app-cms/render/components/ElementStyle";

packages/webiny-app-cms/src/editor/plugins/elements/column/ColumnChild.js

@@ -1,7 +1,7 @@
 // @flow
 import * as React from "react";
 import { compose, withHandlers } from "recompose";
-import { connect } from "react-redux";
+import { connect } from "webiny-app-cms/editor/redux";
 import isEqual from "lodash/isEqual";
 import DropZone from "webiny-app-cms/editor/components/DropZone";
 import Element from "webiny-app-cms/editor/components/Element";