Merge pull request #232 from oarepo/stojanovic/fe-252-modal-close-button

modal close button always inside of the modal
oarepo · Sep 17, 2024 · 12a3163 · 12a3163
2 parents 3aa315d + 34a86b5
commit 12a3163
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/.../theme/assets/semantic-ui/js/oarepo_ui/forms/components/ArrayFieldItem/ArrayFieldItem.jsx b/.../theme/assets/semantic-ui/js/oarepo_ui/forms/components/ArrayFieldItem/ArrayFieldItem.jsx
@@ -49,6 +49,8 @@ export const ArrayFieldItem = ({
             arrayHelpers={arrayHelpers}
             indexPath={indexPath}
             id={removeButtonId}
+            onMouseEnter={() => setHighlighted(true)}
+            onMouseLeave={() => setHighlighted(false)}
             {...removeButtonProps}
           />
         ) : (
@@ -77,7 +79,7 @@ ArrayFieldItem.propTypes = {
   indexPath: PropTypes.number,
   children: PropTypes.node,
   className: PropTypes.string,
-  removeButton: PropTypes.node,
+  removeButton: PropTypes.func,
   removeButtonProps: PropTypes.object,
   displayFirstInputRemoveButton: PropTypes.bool,
   removeButtonLabelClassName: PropTypes.string,

diff --git a/oarepo_ui/theme/assets/semantic-ui/less/oarepo_ui/themes/default/modules/modal.overrides b/oarepo_ui/theme/assets/semantic-ui/less/oarepo_ui/themes/default/modules/modal.overrides
@@ -3,3 +3,9 @@
     height: 80vh;
   }
 }
+
+.ui.modal > .close {
+  top: @innerCloseTop;
+  right: @innerCloseRight;
+  color: @innerCloseColor;
+}
diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = oarepo-ui
-version = 5.2.9
+version = 5.2.10
 description = UI module for invenio 3.5+
 long_description = file: README.md
 long_description_content_type = text/markdown