Przeglądaj źródła

chore(dep): bump @atlaskit/modal-dialog 6.0.12 to 7.1.2

The package now requires using a ModalTransition component
to handle animations. The existing DialogContainer component
has been split into native and web implementations to support
this change.
master
Leonard Kim 6 lat temu
rodzic
commit
8b399e8caf

+ 60
- 89
package-lock.json Wyświetl plik

5
   "requires": true,
5
   "requires": true,
6
   "dependencies": {
6
   "dependencies": {
7
     "@atlaskit/analytics-next": {
7
     "@atlaskit/analytics-next": {
8
-      "version": "3.0.7",
9
-      "resolved": "https://registry.npmjs.org/@atlaskit/analytics-next/-/analytics-next-3.0.7.tgz",
10
-      "integrity": "sha512-osUW2nntOjVKvJBQx2JE21cZ5H13mk8drQkSNw1KJWhV8bDIjZLuDBGqUI6kKbE+M0dGZP4se8YcwILcx1Vdaw==",
8
+      "version": "3.1.2",
9
+      "resolved": "https://registry.npmjs.org/@atlaskit/analytics-next/-/analytics-next-3.1.2.tgz",
10
+      "integrity": "sha512-bkYDvl3Ojsnim+bsc9BALfvOjiL7xdb2rTp/4yqUP9pfidtf5HudbOJ849+dKcRCmk/rFbfB/nhDBRU6rv1Ueg==",
11
       "requires": {
11
       "requires": {
12
+        "@babel/runtime": "^7.0.0",
13
+        "babel-runtime": "^6.26.0",
12
         "prop-types": "^15.5.10"
14
         "prop-types": "^15.5.10"
13
       }
15
       }
14
     },
16
     },
53
       }
55
       }
54
     },
56
     },
55
     "@atlaskit/blanket": {
57
     "@atlaskit/blanket": {
56
-      "version": "7.0.7",
57
-      "resolved": "https://registry.npmjs.org/@atlaskit/blanket/-/blanket-7.0.7.tgz",
58
-      "integrity": "sha512-e2tyj0bBPMVk4ORCGxOXZx4PhDuWXctKkq+aKWeUy6bHFIpNp+r227JAp+MGt4dBj80JFATJXT0SUtxTdLqpTA==",
58
+      "version": "7.0.12",
59
+      "resolved": "https://registry.npmjs.org/@atlaskit/blanket/-/blanket-7.0.12.tgz",
60
+      "integrity": "sha512-IWnXU2N42M14kvTU1YhATiK7vGYPZPsk/c2A+b8tNhRJTcfcTxTPMfcmGOvWYPD128el2TSly4uOvn9B9WKc9A==",
59
       "requires": {
61
       "requires": {
60
-        "@atlaskit/analytics-next": "^3.0.6",
61
-        "@atlaskit/theme": "^6.0.2"
62
+        "@atlaskit/analytics-next": "^3.1.2",
63
+        "@atlaskit/theme": "^7.0.1",
64
+        "@babel/runtime": "^7.0.0"
65
+      },
66
+      "dependencies": {
67
+        "@atlaskit/theme": {
68
+          "version": "7.0.1",
69
+          "resolved": "https://registry.npmjs.org/@atlaskit/theme/-/theme-7.0.1.tgz",
70
+          "integrity": "sha512-wxXDnkUablJketNCrQuNUuazufYEA7kv0Y6Yzv6uvqfuyNpWUQt4H1psz/MW8DbZmCdku9dEYbNVK3nFP5TDGg==",
71
+          "requires": {
72
+            "@babel/runtime": "^7.0.0",
73
+            "prop-types": "^15.5.10"
74
+          }
75
+        }
62
       }
76
       }
63
     },
77
     },
64
     "@atlaskit/button": {
78
     "@atlaskit/button": {
779
       }
793
       }
780
     },
794
     },
781
     "@atlaskit/modal-dialog": {
795
     "@atlaskit/modal-dialog": {
782
-      "version": "6.0.12",
783
-      "resolved": "https://registry.npmjs.org/@atlaskit/modal-dialog/-/modal-dialog-6.0.12.tgz",
784
-      "integrity": "sha512-/64iftFdwTCcizNoGHw1PsIbKkEn0wE0ziMYnEc3IetBZWfJPOzW1SlyuulNGdJl8ZzMVrf9fTt4qMKAUHVbbw==",
785
-      "requires": {
786
-        "@atlaskit/analytics-next": "^3.0.6",
787
-        "@atlaskit/blanket": "^7.0.7",
788
-        "@atlaskit/button": "^9.0.8",
789
-        "@atlaskit/icon": "^13.6.1",
790
-        "@atlaskit/layer-manager": "^5.0.9",
791
-        "@atlaskit/theme": "^6.0.2",
796
+      "version": "7.1.2",
797
+      "resolved": "https://registry.npmjs.org/@atlaskit/modal-dialog/-/modal-dialog-7.1.2.tgz",
798
+      "integrity": "sha512-rY8ojmtr0/9MxqQ8Ab9mtgv1VLRuJMNPCCbstjJzv+NLBu5tIh/on+iuzsxBL84E5hgrvg0wf7JHzKyOoQJQsw==",
799
+      "requires": {
800
+        "@atlaskit/analytics-next": "^3.1.2",
801
+        "@atlaskit/blanket": "^7.0.12",
802
+        "@atlaskit/button": "^10.1.1",
803
+        "@atlaskit/icon": "^15.0.2",
804
+        "@atlaskit/portal": "^0.0.17",
805
+        "@atlaskit/theme": "^7.0.1",
806
+        "@babel/runtime": "^7.0.0",
807
+        "exenv": "^1.2.2",
792
         "prop-types": "^15.5.10",
808
         "prop-types": "^15.5.10",
793
         "raf-schd": "^2.1.0",
809
         "raf-schd": "^2.1.0",
794
         "react-focus-lock": "^1.11.3",
810
         "react-focus-lock": "^1.11.3",
795
-        "react-scrolllock": "^3.0.1",
796
-        "react-transition-group": "^2.2.1"
811
+        "react-scrolllock": "^3.0.2",
812
+        "react-transition-group": "^2.2.1",
813
+        "tiny-invariant": "^0.0.3"
797
       },
814
       },
798
       "dependencies": {
815
       "dependencies": {
799
-        "@atlaskit/button": {
800
-          "version": "9.0.16",
801
-          "resolved": "https://registry.npmjs.org/@atlaskit/button/-/button-9.0.16.tgz",
802
-          "integrity": "sha512-VFk7Qyp+IM2AxsPseHubrqU4ORq5BQPRDafWHVFqg/yf2AzKU1sDavRIX8jQfchnu5rBdBgmQjffX5cArzCawg==",
803
-          "requires": {
804
-            "@atlaskit/analytics-next": "^3.0.10",
805
-            "@atlaskit/spinner": "9.0.10",
806
-            "@atlaskit/theme": "^6.1.1",
807
-            "@babel/runtime": "^7.0.0",
808
-            "babel-runtime": "^6.26.0"
809
-          },
810
-          "dependencies": {
811
-            "@atlaskit/analytics-next": {
812
-              "version": "3.1.2",
813
-              "resolved": "https://registry.npmjs.org/@atlaskit/analytics-next/-/analytics-next-3.1.2.tgz",
814
-              "integrity": "sha512-bkYDvl3Ojsnim+bsc9BALfvOjiL7xdb2rTp/4yqUP9pfidtf5HudbOJ849+dKcRCmk/rFbfB/nhDBRU6rv1Ueg==",
815
-              "requires": {
816
-                "@babel/runtime": "^7.0.0",
817
-                "babel-runtime": "^6.26.0",
818
-                "prop-types": "^15.5.10"
819
-              }
820
-            },
821
-            "@atlaskit/theme": {
822
-              "version": "6.2.1",
823
-              "resolved": "https://registry.npmjs.org/@atlaskit/theme/-/theme-6.2.1.tgz",
824
-              "integrity": "sha512-6u0OxpnZ2n+G7Wc1wckgtOEiYl3wmJ2HvBd28N7d+Fi/fbi+C4TzfBvyeENUqtrp1UIEhweVbB2WLoVoKA5c/w==",
825
-              "requires": {
826
-                "@babel/runtime": "^7.0.0",
827
-                "prop-types": "^15.5.10"
828
-              }
829
-            }
830
-          }
831
-        },
832
-        "@atlaskit/spinner": {
833
-          "version": "9.0.10",
834
-          "resolved": "https://registry.npmjs.org/@atlaskit/spinner/-/spinner-9.0.10.tgz",
835
-          "integrity": "sha512-1akBXR6uC/cRWzwGPF4IfS7YpCsHdlncvo98p4W9ZGRn822SBQk9hiZBL0BfvkEFViAakPV7JZ5zZKc75UExhA==",
816
+        "@atlaskit/icon": {
817
+          "version": "15.0.3",
818
+          "resolved": "https://registry.npmjs.org/@atlaskit/icon/-/icon-15.0.3.tgz",
819
+          "integrity": "sha512-UAf7U0/+5giS2uMlOeVMYmhuWD4fQy0eRcp7r8oEDBqZXNH0yIuHrfu1bPgt2SbFotrjxZdPpOX1i1dXEu7y6g==",
836
           "requires": {
820
           "requires": {
837
-            "@atlaskit/theme": "^6.1.1",
821
+            "@atlaskit/theme": "^7.0.1",
838
             "@babel/runtime": "^7.0.0",
822
             "@babel/runtime": "^7.0.0",
839
             "babel-runtime": "^6.26.0",
823
             "babel-runtime": "^6.26.0",
840
-            "react-transition-group": "^2.2.1"
841
-          },
842
-          "dependencies": {
843
-            "@atlaskit/theme": {
844
-              "version": "6.2.1",
845
-              "resolved": "https://registry.npmjs.org/@atlaskit/theme/-/theme-6.2.1.tgz",
846
-              "integrity": "sha512-6u0OxpnZ2n+G7Wc1wckgtOEiYl3wmJ2HvBd28N7d+Fi/fbi+C4TzfBvyeENUqtrp1UIEhweVbB2WLoVoKA5c/w==",
847
-              "requires": {
848
-                "@babel/runtime": "^7.0.0",
849
-                "prop-types": "^15.5.10"
850
-              }
851
-            }
824
+            "uuid": "^3.1.0"
852
           }
825
           }
853
         },
826
         },
854
-        "react-transition-group": {
855
-          "version": "2.4.0",
856
-          "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.4.0.tgz",
857
-          "integrity": "sha512-Xv5d55NkJUxUzLCImGSanK8Cl/30sgpOEMGc5m86t8+kZwrPxPCPcFqyx83kkr+5Lz5gs6djuvE5By+gce+VjA==",
827
+        "@atlaskit/theme": {
828
+          "version": "7.0.1",
829
+          "resolved": "https://registry.npmjs.org/@atlaskit/theme/-/theme-7.0.1.tgz",
830
+          "integrity": "sha512-wxXDnkUablJketNCrQuNUuazufYEA7kv0Y6Yzv6uvqfuyNpWUQt4H1psz/MW8DbZmCdku9dEYbNVK3nFP5TDGg==",
858
           "requires": {
831
           "requires": {
859
-            "dom-helpers": "^3.3.1",
860
-            "loose-envify": "^1.3.1",
861
-            "prop-types": "^15.6.2",
862
-            "react-lifecycles-compat": "^3.0.4"
863
-          },
864
-          "dependencies": {
865
-            "prop-types": {
866
-              "version": "15.6.2",
867
-              "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.2.tgz",
868
-              "integrity": "sha512-3pboPvLiWD7dkI3qf3KbUe6hKFKa52w+AE0VCqECtf+QHAKgOL37tTaNCnuX1nAAQ4ZhyP+kYVKf8rLmJ/feDQ==",
869
-              "requires": {
870
-                "loose-envify": "^1.3.1",
871
-                "object-assign": "^4.1.1"
872
-              }
873
-            }
832
+            "@babel/runtime": "^7.0.0",
833
+            "prop-types": "^15.5.10"
874
           }
834
           }
875
         }
835
         }
876
       }
836
       }
924
         "react-popper": "1.0.2"
884
         "react-popper": "1.0.2"
925
       }
885
       }
926
     },
886
     },
887
+    "@atlaskit/portal": {
888
+      "version": "0.0.17",
889
+      "resolved": "https://registry.npmjs.org/@atlaskit/portal/-/portal-0.0.17.tgz",
890
+      "integrity": "sha512-nn7b0xd1f/zHaAVCl18vmInPS5/P3zJyDP5pVBeH6Lg4Xo60BR1SDOca9EzKqvxs0FFE84HWcjpWSBRxHZ5sHw==",
891
+      "requires": {
892
+        "@babel/runtime": "^7.0.0",
893
+        "babel-runtime": "^6.26.0",
894
+        "exenv": "^1.2.2",
895
+        "tiny-invariant": "^0.0.3"
896
+      }
897
+    },
927
     "@atlaskit/spinner": {
898
     "@atlaskit/spinner": {
928
       "version": "9.0.13",
899
       "version": "9.0.13",
929
       "resolved": "https://registry.npmjs.org/@atlaskit/spinner/-/spinner-9.0.13.tgz",
900
       "resolved": "https://registry.npmjs.org/@atlaskit/spinner/-/spinner-9.0.13.tgz",

+ 1
- 1
package.json Wyświetl plik

27
     "@atlaskit/inline-message": "7.0.10",
27
     "@atlaskit/inline-message": "7.0.10",
28
     "@atlaskit/layer-manager": "5.0.19",
28
     "@atlaskit/layer-manager": "5.0.19",
29
     "@atlaskit/lozenge": "6.2.4",
29
     "@atlaskit/lozenge": "6.2.4",
30
-    "@atlaskit/modal-dialog": "6.0.12",
30
+    "@atlaskit/modal-dialog": "7.1.2",
31
     "@atlaskit/multi-select": "11.0.13",
31
     "@atlaskit/multi-select": "11.0.13",
32
     "@atlaskit/spinner": "9.0.13",
32
     "@atlaskit/spinner": "9.0.13",
33
     "@atlaskit/tabs": "8.0.11",
33
     "@atlaskit/tabs": "8.0.11",

react/features/base/dialog/components/DialogContainer.js → react/features/base/dialog/components/AbstractDialogContainer.js Wyświetl plik

1
 /* @flow */
1
 /* @flow */
2
 
2
 
3
 import React, { Component } from 'react';
3
 import React, { Component } from 'react';
4
-import { connect } from 'react-redux';
5
 
4
 
6
 /**
5
 /**
7
  * The type of the React {@code Component} props of {@link DialogContainer}.
6
  * The type of the React {@code Component} props of {@link DialogContainer}.
25
 };
24
 };
26
 
25
 
27
 /**
26
 /**
28
- * Implements a DialogContainer responsible for showing all dialogs. We will
29
- * need a separate container so we can handle multiple dialogs by showing them
30
- * simultaneously or queuing them.
27
+ * Implements a DialogContainer responsible for showing all dialogs.
31
  */
28
  */
32
-export class DialogContainer extends Component<Props> {
29
+export default class AbstractDialogContainer extends Component<Props> {
33
     /**
30
     /**
34
-     * Implements React's {@link Component#render()}.
31
+     * Returns the dialog to be displayed.
35
      *
32
      *
36
-     * @inheritdoc
37
-     * @returns {ReactElement}
33
+     * @private
34
+     * @returns {ReactElement|null}
38
      */
35
      */
39
-    render() {
36
+    _renderDialogContent() {
40
         const {
37
         const {
41
             _component: component,
38
             _component: component,
42
             _reducedUI: reducedUI
39
             _reducedUI: reducedUI
50
 }
47
 }
51
 
48
 
52
 /**
49
 /**
53
- * Maps (parts of) the redux state to the associated {@code DialogContainer}'s
54
- * props.
50
+ * Maps (parts of) the redux state to the associated
51
+ * {@code AbstractDialogContainer}'s props.
55
  *
52
  *
56
  * @param {Object} state - The redux state.
53
  * @param {Object} state - The redux state.
57
  * @private
54
  * @private
61
  *     _reducedUI: boolean
58
  *     _reducedUI: boolean
62
  * }}
59
  * }}
63
  */
60
  */
64
-function _mapStateToProps(state) {
61
+export function abstractMapStateToProps(state: Object) {
65
     const stateFeaturesBaseDialog = state['features/base/dialog'];
62
     const stateFeaturesBaseDialog = state['features/base/dialog'];
66
     const { reducedUI } = state['features/base/responsive-ui'];
63
     const { reducedUI } = state['features/base/responsive-ui'];
67
 
64
 
71
         _reducedUI: reducedUI
68
         _reducedUI: reducedUI
72
     };
69
     };
73
 }
70
 }
74
-
75
-export default connect(_mapStateToProps)(DialogContainer);

+ 0
- 1
react/features/base/dialog/components/index.js Wyświetl plik

2
 
2
 
3
 export * from './_';
3
 export * from './_';
4
 
4
 
5
-export { default as DialogContainer } from './DialogContainer';
6
 export { default as DialogContent } from './DialogContent';
5
 export { default as DialogContent } from './DialogContent';

+ 26
- 0
react/features/base/dialog/components/native/DialogContainer.js Wyświetl plik

1
+import { connect } from 'react-redux';
2
+
3
+import AbstractDialogContainer, {
4
+    abstractMapStateToProps
5
+} from '../AbstractDialogContainer';
6
+
7
+/**
8
+ * Implements a DialogContainer responsible for showing all dialogs. We will
9
+ * need a separate container so we can handle multiple dialogs by showing them
10
+ * simultaneously or queueing them.
11
+ *
12
+ * @extends AbstractDialogContainer
13
+ */
14
+class DialogContainer extends AbstractDialogContainer {
15
+    /**
16
+     * Implements React's {@link Component#render()}.
17
+     *
18
+     * @inheritdoc
19
+     * @returns {ReactElement}
20
+     */
21
+    render() {
22
+        return this._renderDialogContent();
23
+    }
24
+}
25
+
26
+export default connect(abstractMapStateToProps)(DialogContainer);

+ 1
- 0
react/features/base/dialog/components/native/index.js Wyświetl plik

3
 export { default as BottomSheet } from './BottomSheet';
3
 export { default as BottomSheet } from './BottomSheet';
4
 export { default as ConfirmDialog } from './ConfirmDialog';
4
 export { default as ConfirmDialog } from './ConfirmDialog';
5
 export { default as CustomDialog } from './CustomDialog';
5
 export { default as CustomDialog } from './CustomDialog';
6
+export { default as DialogContainer } from './DialogContainer';
6
 export { default as InputDialog } from './InputDialog';
7
 export { default as InputDialog } from './InputDialog';
7
 export { default as CustomSubmitDialog } from './CustomSubmitDialog';
8
 export { default as CustomSubmitDialog } from './CustomSubmitDialog';
8
 
9
 

+ 32
- 0
react/features/base/dialog/components/web/DialogContainer.js Wyświetl plik

1
+import { ModalTransition } from '@atlaskit/modal-dialog';
2
+import React from 'react';
3
+import { connect } from 'react-redux';
4
+
5
+import AbstractDialogContainer, {
6
+    abstractMapStateToProps
7
+} from '../AbstractDialogContainer';
8
+
9
+/**
10
+ * Implements a DialogContainer responsible for showing all dialogs. Necessary
11
+ * for supporting @atlaskit's modal animations.
12
+ *
13
+ * @extends AbstractDialogContainer
14
+ */
15
+class DialogContainer extends AbstractDialogContainer {
16
+    /**
17
+     * Implements React's {@link Component#render()}.
18
+     *
19
+     * @inheritdoc
20
+     * @returns {ReactElement}
21
+     */
22
+    render() {
23
+        return (
24
+            <ModalTransition>
25
+                { this._renderDialogContent() }
26
+            </ModalTransition>
27
+        );
28
+    }
29
+}
30
+
31
+export default connect(abstractMapStateToProps)(DialogContainer);
32
+

+ 1
- 0
react/features/base/dialog/components/web/index.js Wyświetl plik

3
 export { default as AbstractDialogTab } from './AbstractDialogTab';
3
 export { default as AbstractDialogTab } from './AbstractDialogTab';
4
 export type { Props as AbstractDialogTabProps } from './AbstractDialogTab';
4
 export type { Props as AbstractDialogTabProps } from './AbstractDialogTab';
5
 export { default as Dialog } from './Dialog';
5
 export { default as Dialog } from './Dialog';
6
+export { default as DialogContainer } from './DialogContainer';
6
 export { default as DialogWithTabs } from './DialogWithTabs';
7
 export { default as DialogWithTabs } from './DialogWithTabs';
7
 export { default as StatelessDialog } from './StatelessDialog';
8
 export { default as StatelessDialog } from './StatelessDialog';

Ładowanie…
Anuluj
Zapisz