Updated renders and fixed tests.

formio · Nov 10, 2023 · 60293ce · 60293ce
1 parent 6cd417d
commit 60293ce
Show file tree

Hide file tree

Showing 27 changed files with 108 additions and 249 deletions.
diff --git a/package.json b/package.json
@@ -81,9 +81,9 @@
   },
   "homepage": "https://github.com/formio/formio.js#readme",
   "dependencies": {
-    "@formio/bootstrap": "^3.0.0-rc.15",
+    "@formio/bootstrap": "^3.0.0-rc.17",
     "@formio/choices.js": "^10.2.0",
-    "@formio/core": "^1.3.0-rc.23",
+    "@formio/core": "^2.0.0-rc.1",
     "@formio/text-mask-addons": "^3.8.0-formio.2",
     "@formio/vanilla-text-mask": "^5.1.1-formio.1",
     "abortcontroller-polyfill": "^1.7.5",

diff --git a/test/renders/component-bootstrap-columns-multiple.html b/test/renders/component-bootstrap-columns-multiple.html
@@ -1,17 +1,9 @@
 <div id="columns" class="row formio-component formio-component-columns formio-component-columns formio-component-multiple  formio-component-label-hidden" ref="component">
-  <div class="
-    col-md-6
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns">
+  <div class="col-md-6
+    offset-md-0" ref="column-columns">
   </div>
-  <div class="
-    col-md-6
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns">
+  <div class="col-md-6
+    offset-md-0" ref="column-columns">
   </div>
   <div ref="messageContainer" class="formio-errors invalid-feedback"></div>
 </div>
diff --git a/test/renders/component-bootstrap-columns-readOnly.html b/test/renders/component-bootstrap-columns-readOnly.html
@@ -1,17 +1,9 @@
 <div id="columns" class="row formio-component formio-component-columns formio-component-columns  formio-component-label-hidden" ref="component">
-  <div class="
-    col-md-6
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns">
+  <div class="col-md-6
+    offset-md-0" ref="column-columns">
   </div>
-  <div class="
-    col-md-6
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns">
+  <div class="col-md-6
+    offset-md-0" ref="column-columns">
   </div>
   <div ref="messageContainer" class="formio-errors invalid-feedback"></div>
 </div>
diff --git a/test/renders/component-bootstrap-columns-required.html b/test/renders/component-bootstrap-columns-required.html
@@ -1,18 +1,10 @@
 <div id="columns" class="row formio-component formio-component-columns formio-component-columns  formio-component-label-hidden" ref="component">
   <label class=" control-label--hidden"></label>
-  <div class="
-    col-md-6
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns">
+  <div class="col-md-6
+    offset-md-0" ref="column-columns">
   </div>
-  <div class="
-    col-md-6
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns">
+  <div class="col-md-6
+    offset-md-0" ref="column-columns">
   </div>
   <div ref="messageContainer" class="formio-errors invalid-feedback"></div>
 </div>
diff --git a/test/renders/component-bootstrap-columns.html b/test/renders/component-bootstrap-columns.html
@@ -1,17 +1,9 @@
 <div id="columns" class="row formio-component formio-component-columns formio-component-columns  formio-component-label-hidden" ref="component">
-  <div class="
-    col-md-6
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns">
+  <div class="col-md-6
+    offset-md-0" ref="column-columns">
   </div>
-  <div class="
-    col-md-6
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns">
+  <div class="col-md-6
+    offset-md-0" ref="column-columns">
   </div>
   <div ref="messageContainer" class="formio-errors invalid-feedback"></div>
 </div>
diff --git a/test/renders/component-bootstrap-datagrid-readOnly.html b/test/renders/component-bootstrap-datagrid-readOnly.html
@@ -3,7 +3,7 @@
     Data Grid
   </label>
   <table class="table datagrid-table table-bordered
-    ">
+    " style="table-layout: fixed;">
     <tbody ref="datagrid-dataGrid-tbody" data-key="datagrid-dataGrid">
       <tr ref="datagrid-dataGrid-row">
       </tr>

diff --git a/test/renders/component-bootstrap-datamap-readOnly.html b/test/renders/component-bootstrap-datamap-readOnly.html
@@ -3,7 +3,7 @@
     Data Map
   </label>
   <table class="table datagrid-table table-bordered
-    ">
+    " style="table-layout: fixed;">
     <thead>
       <tr>
         <th class="">

diff --git a/test/renders/form-bootstrap-columnsForm.html b/test/renders/form-bootstrap-columnsForm.html
@@ -1,19 +1,11 @@
 <div id="" class="formio-component formio-component-form  formio-component-label-hidden" ref="component">
   <div class="formio-form" ref="webform" novalidate>
     <div id="columns" class="row formio-component formio-component-columns formio-component-columns  formio-component-label-hidden" ref="component">
-      <div class="
-    col-md-6
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns">
+      <div class="col-md-6
+    offset-md-0" ref="column-columns">
       </div>
-      <div class="
-    col-md-6
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns">
+      <div class="col-md-6
+    offset-md-0" ref="column-columns">
       </div>
       <div ref="messageContainer" class="formio-errors invalid-feedback"></div>
     </div>

diff --git a/test/renders/form-bootstrap-defaults.html b/test/renders/form-bootstrap-defaults.html
@@ -271,12 +271,8 @@
       <div ref="messageContainer" class="formio-errors invalid-feedback"></div>
     </div>
     <div id="columns" class="row formio-component formio-component-columns formio-component-columns  formio-component-label-hidden" ref="component">
-      <div class="
-    col-md-6
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns">
+      <div class="col-md-6
+    offset-md-0" ref="column-columns">
         <div id="textField" class="mb-2 formio-form-group has-feedback formio-component formio-component-textfield formio-component-textField " ref="component">
           <label ref="label" class="col-form-label " for="textField-textField" id="l-textField-textField">
             Text Field
@@ -287,12 +283,8 @@
           <div ref="messageContainer" class="formio-errors invalid-feedback"></div>
         </div>
       </div>
-      <div class="
-    col-md-6
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns">
+      <div class="col-md-6
+    offset-md-0" ref="column-columns">
       </div>
       <div ref="messageContainer" class="formio-errors invalid-feedback"></div>
     </div>

diff --git a/test/renders/form-bootstrap-formWithCollapsedPanel.html b/test/renders/form-bootstrap-formWithCollapsedPanel.html
@@ -4,7 +4,7 @@
       <div class="mb-2 card border">
         <div class="card-header bg-default" tabindex="0" role="button" aria-expanded="false" aria-controls="panel-panel" ref="header">
           <span class="mb-0 card-title ">
-        <i class="formio-collapse-icon fa fa-plus-square-o bi bi-plus-square-o text-muted" data-title="Collapse Panel"></i>
+        <i class="formio-collapse-icon fa fa-plus-square-o bi bi-plus-square text-muted" data-title="Collapse Panel"></i>
       Panel
     </span>
         </div>

diff --git a/test/renders/form-bootstrap-formWithDateTimeComponents.html b/test/renders/form-bootstrap-formWithDateTimeComponents.html
@@ -4,7 +4,7 @@
       <div class="mb-2 card border">
         <div class="card-header bg-default" tabindex="0" role="button" aria-expanded="true" aria-controls="panel-panel" ref="header">
           <span class="mb-0 card-title ">
-        <i class="formio-collapse-icon fa fa-minus-square-o bi bi-minus-square-o text-muted" data-title="Collapse Panel"></i>
+        <i class="formio-collapse-icon fa fa-minus-square-o bi bi-dash-square text-muted" data-title="Collapse Panel"></i>
       Panel
     </span>
         </div>

diff --git a/test/renders/form-bootstrap-initiallyCollapsedPanel.html b/test/renders/form-bootstrap-initiallyCollapsedPanel.html
@@ -4,7 +4,7 @@
       <div class="mb-2 card border">
         <div class="card-header bg-default" tabindex="0" role="button" aria-expanded="false" aria-controls="panel-panel" ref="header">
           <span class="mb-0 card-title ">
-        <i class="formio-collapse-icon fa fa-plus-square-o bi bi-plus-square-o text-muted" data-title="Collapse Panel"></i>
+        <i class="formio-collapse-icon fa fa-plus-square-o bi bi-plus-square text-muted" data-title="Collapse Panel"></i>
       Panel
     </span>
         </div>

diff --git a/test/renders/form-bootstrap-layout.html b/test/renders/form-bootstrap-layout.html
@@ -1,12 +1,8 @@
 <div id="" class="formio-component formio-component-form  formio-component-label-hidden" ref="component">
   <div class="formio-form" ref="webform" novalidate>
     <div id="columns" class="row formio-component formio-component-columns formio-component-columns  formio-component-label-hidden" ref="component">
-      <div class="
-    col-md-6
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns">
+      <div class="col-md-6
+    offset-md-0" ref="column-columns">
         <div id="columnsText" class="mb-2 formio-form-group has-feedback formio-component formio-component-textfield formio-component-columnsText " ref="component">
           <label ref="label" class="col-form-label " for="columnsText-columnsText" id="l-columnsText-columnsText">
             Text
@@ -17,22 +13,14 @@
           <div ref="messageContainer" class="formio-errors invalid-feedback"></div>
         </div>
       </div>
-      <div class="
-    col-md-6
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns">
+      <div class="col-md-6
+    offset-md-0" ref="column-columns">
       </div>
       <div ref="messageContainer" class="formio-errors invalid-feedback"></div>
     </div>
     <div id="columns2" class="row formio-component formio-component-columns formio-component-columns2  formio-component-label-hidden" ref="component">
-      <div class="
-    col-md-5
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns2">
+      <div class="col-md-5
+    offset-md-0" ref="column-columns2">
         <div id="columns2Text" class="mb-2 formio-form-group has-feedback formio-component formio-component-textfield formio-component-columns2Text " ref="component">
           <label ref="label" class="col-form-label " for="columns2Text-columns2Text" id="l-columns2Text-columns2Text">
             Text
@@ -43,19 +31,11 @@
           <div ref="messageContainer" class="formio-errors invalid-feedback"></div>
         </div>
       </div>
-      <div class="
-    col-md-5
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns2">
+      <div class="col-md-5
+    offset-md-0" ref="column-columns2">
       </div>
-      <div class="
-    col-md-2
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns2">
+      <div class="col-md-2
+    offset-md-0" ref="column-columns2">
       </div>
       <div ref="messageContainer" class="formio-errors invalid-feedback"></div>
     </div>
@@ -106,7 +86,7 @@
       <div class="mb-2 card border">
         <div class="card-header bg-default" tabindex="0" role="button" aria-expanded="false" aria-controls="panel2-panel2" ref="header">
           <span class="mb-0 card-title ">
-        <i class="formio-collapse-icon fa fa-plus-square-o bi bi-plus-square-o text-muted" data-title="Collapse Panel"></i>
+        <i class="formio-collapse-icon fa fa-plus-square-o bi bi-plus-square text-muted" data-title="Collapse Panel"></i>
     </span>
         </div>
       </div>
@@ -116,7 +96,7 @@
       <div class="mb-2 card border">
         <div class="card-header bg-default" tabindex="0" role="button" aria-expanded="true" aria-controls="panel3-panel3" ref="header">
           <span class="mb-0 card-title ">
-        <i class="formio-collapse-icon fa fa-minus-square-o bi bi-minus-square-o text-muted" data-title="Collapse Panel"></i>
+        <i class="formio-collapse-icon fa fa-minus-square-o bi bi-dash-square text-muted" data-title="Collapse Panel"></i>
     </span>
         </div>
         <div class="card-body" ref="nested-panel3" id="panel3-panel3">

diff --git a/test/renders/form-bootstrap-multipleTextareaInsideConditionalComponent.html b/test/renders/form-bootstrap-multipleTextareaInsideConditionalComponent.html
@@ -1,12 +1,8 @@
 <div id="" class="formio-component formio-component-form  formio-component-label-hidden" ref="component">
   <div class="formio-form" ref="webform" novalidate>
     <div id="columns3" class="row formio-component formio-component-columns formio-component-columns3  formio-component-label-hidden" ref="component">
-      <div class="
-    col-md-6
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns3">
+      <div class="col-md-6
+    offset-md-0" ref="column-columns3">
         <div id="issues" class="" ref="component">
           <div class="card card-body bg-light mb-3">
             <div ref="nested-issues">
@@ -32,12 +28,8 @@
           <div ref="messageContainer" class="formio-errors invalid-feedback"></div>
         </div>
       </div>
-      <div class="
-    col-md-6
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns3">
+      <div class="col-md-6
+    offset-md-0" ref="column-columns3">
       </div>
       <div ref="messageContainer" class="formio-errors invalid-feedback"></div>
     </div>

diff --git a/test/renders/form-bootstrap-readOnly-calculateValueWithManualOverride.html b/test/renders/form-bootstrap-readOnly-calculateValueWithManualOverride.html
@@ -31,7 +31,7 @@
               grid
             </label>
             <table class="table datagrid-table table-bordered
-    ">
+    " style="table-layout: fixed;">
               <thead>
                 <tr>
                   <th class="">

diff --git a/test/renders/form-bootstrap-readOnly-columnsForm.html b/test/renders/form-bootstrap-readOnly-columnsForm.html
@@ -1,19 +1,11 @@
 <div id="" class="formio-component formio-component-form  formio-component-label-hidden" ref="component">
   <div class="formio-form formio-read-only" ref="webform" novalidate>
     <div id="columns" class="row formio-component formio-component-columns formio-component-columns  formio-component-label-hidden" ref="component">
-      <div class="
-    col-md-6
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns">
+      <div class="col-md-6
+    offset-md-0" ref="column-columns">
       </div>
-      <div class="
-    col-md-6
-    col-md-offset-0
-    col-md-push-0
-    col-md-pull-0
-  " ref="column-columns">
+      <div class="col-md-6
+    offset-md-0" ref="column-columns">
       </div>
       <div ref="messageContainer" class="formio-errors invalid-feedback"></div>
     </div>

diff --git a/test/renders/form-bootstrap-readOnly-data.html b/test/renders/form-bootstrap-readOnly-data.html
@@ -25,7 +25,7 @@
         Data Grid
       </label>
       <table class="table datagrid-table table-bordered
-    ">
+    " style="table-layout: fixed;">
         <thead>
           <tr>
             <th class="">
@@ -171,7 +171,7 @@
         Data Grid
       </label>
       <table class="table datagrid-table table-bordered
-    ">
+    " style="table-layout: fixed;">
         <tbody ref="datagrid-dataGrid2-tbody" data-key="datagrid-dataGrid2">
           <tr ref="datagrid-dataGrid2-row">
             <td ref="datagrid-dataGrid2">
@@ -207,7 +207,7 @@
         Conditional Data Grid
       </label>
       <table class="table datagrid-table table-bordered
-    ">
+    " style="table-layout: fixed;">
         <thead>
           <tr>
             <th class="">