TASK: Move component FlashMessages to neos-ui-error package

neos · Jun 11, 2024 · 7cd6b2d · 7cd6b2d
1 parent 492f0cd
commit 7cd6b2d
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 30 deletions.
diff --git a/packages/neos-ui-error/package.json b/packages/neos-ui-error/package.json
@@ -6,9 +6,11 @@
   "main": "./src/index.ts",
   "dependencies": {
     "@neos-project/neos-ui-i18n": "workspace:*",
+    "@neos-project/neos-ui-redux-store": "workspace:*",
     "@neos-project/react-ui-components": "workspace:*",
     "classnames": "^2.2.3",
-    "react": "^16.12.0"
+    "react": "^16.12.0",
+    "react-redux": "^7.1.3"
   },
   "license": "GNU GPLv3",
   "stableVersion": "8.3.4"

diff --git a/...ashMessages/FlashMessage/FlashMessage.tsx → .../container/FlashMessages/FlashMessage.tsx b/...ashMessages/FlashMessage/FlashMessage.tsx → .../container/FlashMessages/FlashMessage.tsx
diff --git a/...ontainers/FlashMessages/FlashMessages.tsx → ...container/FlashMessages/FlashMessages.tsx b/...ontainers/FlashMessages/FlashMessages.tsx → ...container/FlashMessages/FlashMessages.tsx
@@ -14,7 +14,7 @@ import {connect} from 'react-redux';
 import {actions} from '@neos-project/neos-ui-redux-store';
 import {GlobalState} from '@neos-project/neos-ui-redux-store/src/System';
 
-import FlashMessage from './FlashMessage';
+import {FlashMessage} from './FlashMessage';
 
 import style from './style.module.css';
 

diff --git a/...iners/FlashMessages/FlashMessage/index.ts → ...rror/src/container/FlashMessages/index.ts b/...iners/FlashMessages/FlashMessage/index.ts → ...rror/src/container/FlashMessages/index.ts
@@ -7,4 +7,4 @@
  * information, please view the LICENSE file which was distributed with this
  * source code.
  */
-export {FlashMessage as default} from './FlashMessage';
+export {FlashMessages} from './FlashMessages';
diff --git a/...ashMessages/FlashMessage/style.module.css → .../container/FlashMessages/style.module.css b/...ashMessages/FlashMessage/style.module.css → .../container/FlashMessages/style.module.css
@@ -1,3 +1,19 @@
+.flashMessageContainer {
+    position: fixed;
+    z-index: var(--zIndex-FlashMessageContainer);
+    top: 0;
+    left: 50%;
+    width: 516px;
+    margin-top: 8px;
+    transform: translate(-50%, 0);
+    max-height: calc(100% - 16px);
+    overflow: auto;
+
+    &:empty {
+        display: none;
+    }
+}
+
 .flashMessage {
     color: white;
     font-size: 14px;
@@ -30,7 +46,7 @@
     position: absolute;
     left: 0;
     top: 0;
-    height: 100%;
+    height: 100% !important;
     line-height: var(--spacing-GoldenUnit);
     width: var(--spacing-GoldenUnit) !important;
     text-align: center;

diff --git a/packages/neos-ui-error/src/container/index.ts b/packages/neos-ui-error/src/container/index.ts
@@ -9,3 +9,4 @@
  */
 export {ErrorBoundary, terminateDueToFatalInitializationError} from './ErrorBoundary';
 export {ErrorView} from './ErrorView';
+export {FlashMessages} from './FlashMessages';
diff --git a/packages/neos-ui-error/src/index.ts b/packages/neos-ui-error/src/index.ts
@@ -17,5 +17,6 @@ export type {
 export {
     ErrorBoundary,
     ErrorView,
+    FlashMessages,
     terminateDueToFatalInitializationError
 } from './container';
diff --git a/packages/neos-ui/src/Containers/App.js b/packages/neos-ui/src/Containers/App.js
@@ -4,7 +4,7 @@ import {connect} from 'react-redux';
 import mergeClassNames from 'classnames';
 import style from './style.module.css';
 
-import FlashMessages from './FlashMessages/index';
+import {FlashMessages} from '@neos-project/neos-ui-error';
 
 const App = ({globalRegistry, menu, isFullScreen, leftSidebarIsHidden, rightSidebarIsHidden}) => {
     const containerRegistry = globalRegistry.get('containers');

diff --git a/packages/neos-ui/src/Containers/FlashMessages/index.ts b/packages/neos-ui/src/Containers/FlashMessages/index.ts
diff --git a/packages/neos-ui/src/Containers/FlashMessages/style.module.css b/packages/neos-ui/src/Containers/FlashMessages/style.module.css
diff --git a/yarn.lock b/yarn.lock
@@ -2442,9 +2442,11 @@ __metadata:
   resolution: "@neos-project/neos-ui-error@workspace:packages/neos-ui-error"
   dependencies:
     "@neos-project/neos-ui-i18n": "workspace:*"
+    "@neos-project/neos-ui-redux-store": "workspace:*"
     "@neos-project/react-ui-components": "workspace:*"
     classnames: ^2.2.3
     react: ^16.12.0
+    react-redux: ^7.1.3
   languageName: unknown
   linkType: soft