DEP Upgrade bootstrap and reactstrap

silverstripe · Jan 22, 2025 · e2a78f3 · e2a78f3
1 parent 7a7755c
commit e2a78f3
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 129 deletions.
diff --git a/client/dist/js/SilverStripeNavigator.js b/client/dist/js/SilverStripeNavigator.js
diff --git a/client/dist/styles/bundle.css b/client/dist/styles/bundle.css
diff --git a/client/src/legacy/SilverStripeNavigator.js b/client/src/legacy/SilverStripeNavigator.js
@@ -46,7 +46,7 @@
       });
     }
 
-    const closeLinks = popup.querySelectorAll('a.close');
+    const closeLinks = popup.querySelectorAll('a.close,a.btn-close');
     if (closeLinks.length > 0) {
       for (const link of closeLinks.values()) {
         link.addEventListener('click', function(e) {

diff --git a/client/src/styles/legacy/_CMSMain.scss b/client/src/styles/legacy/_CMSMain.scss
@@ -146,20 +146,6 @@
 		flex: 0 1 250px;
   }
 
-  .input-group-append {
-    z-index: 2;
-
-    &:last-of-type {
-      z-index: 1;
-    }
-
-    .btn {
-      margin-top: 0;
-      padding-top: $input-padding-y;
-      padding-bottom: $input-padding-y;
-    }
-  }
-
 	.help {
 		margin-left: 0;
 	}

diff --git a/code/Controllers/CMSMain.php b/code/Controllers/CMSMain.php
@@ -1757,7 +1757,7 @@ public function ListViewForm()
                 if ($num) {
                     $screenReaderText = _t(__CLASS__ . '.NUM_CHILD_RECORDS', 'one child record|{count} child records', ['count' => $num]);
                     return sprintf(
-                        '<a class="btn btn-secondary btn--no-text btn--icon-large font-icon-right-dir cms-panel-link list-children-link" data-pjax-target="ListViewForm,Breadcrumbs" href="%s"><span class="sr-only">%s</span></a>',
+                        '<a class="btn btn-secondary btn--no-text btn--icon-large font-icon-right-dir cms-panel-link list-children-link" data-pjax-target="ListViewForm,Breadcrumbs" href="%s"><span class="visually-hidden">%s</span></a>',
                         $this->LinkListViewChildren((int)$item->ID),
                         $screenReaderText
                     );

diff --git a/package.json b/package.json
@@ -33,7 +33,7 @@
   "homepage": "https://github.com/silverstripe/silverstripe-cms#readme",
   "dependencies": {
     "@popperjs/core": "^2.11.6",
-    "bootstrap": "^4.6.2",
+    "bootstrap": "^5.2.0",
     "classnames": "^2.3.2",
     "deep-freeze-strict": "^1.1.1",
     "isomorphic-fetch": "^3.0.0",
@@ -43,7 +43,7 @@
     "react-dom": "^18.2.0",
     "react-redux": "^9.2.0",
     "react-select": "^5.6.0",
-    "reactstrap": "^8.9.0",
+    "reactstrap": "^9.2.0",
     "reactstrap-confirm": "^1.3.2",
     "redux": "^5.0.1",
     "redux-form": "^8.3.10"

diff --git a/templates/SilverStripe/CMS/Forms/SiteTreeURLSegmentField.ss b/templates/SilverStripe/CMS/Forms/SiteTreeURLSegmentField.ss
@@ -12,16 +12,12 @@
 <div class="edit-holder">
     <div class="input-group">
         <input $AttributesHTML />
-        <div class="input-group-append">
-            <button role="button" type="button" class="btn btn-primary update">
-                <%t SilverStripe\CMS\Forms\SiteTreeURLSegmentField.OK 'OK' %>
-            </button>
-        </div>
-        <div class="input-group-append">
-            <button role="button" type="button" class="btn btn-outline-secondary btn-sm input-group-append cancel">
-                <%t SilverStripe\CMS\Forms\SiteTreeURLSegmentField.Cancel 'Cancel' %>
-            </button>
-        </div>
+        <button role="button" type="button" class="btn btn-primary update">
+            <%t SilverStripe\CMS\Forms\SiteTreeURLSegmentField.OK 'OK' %>
+        </button>
+        <button role="button" type="button" class="btn btn-outline-secondary btn-sm cancel">
+            <%t SilverStripe\CMS\Forms\SiteTreeURLSegmentField.Cancel 'Cancel' %>
+        </button>
     </div>
     <% if $HelpText %><p class="form__field-description">$HelpText</p><% end_if %>
 </div>