Update upcast for columns

ubc-web-services · Jun 28, 2024 · 4b9c707 · 4b9c707
1 parent 16a05f9
commit 4b9c707
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 15 deletions.
diff --git a/js/build/ubcColumnsFour.js b/js/build/ubcColumnsFour.js
diff --git a/js/build/ubcColumnsThree.js b/js/build/ubcColumnsThree.js
diff --git a/js/build/ubcColumnsTwo.js b/js/build/ubcColumnsTwo.js
diff --git a/js/ckeditor5_plugins/ubcColumnsFour/src/ubccolumnsfourcommand.js b/js/ckeditor5_plugins/ubcColumnsFour/src/ubccolumnsfourcommand.js
@@ -77,16 +77,16 @@ function createUbcColumnsFour(writer) {
     class: 'widget-column-options widget-columns-4 align-equal'
   });
   const firstColumn = writer.createElement('ubcColumnsFourColumn', {
-    class: 'widget-region-one'
+    class: 'widget-region-one first-child--mt-0'
   });
   const secondColumn = writer.createElement('ubcColumnsFourColumn', {
-    class: 'widget-region-two'
+    class: 'widget-region-two first-child--mt-0'
   });
   const thirdColumn = writer.createElement('ubcColumnsFourColumn', {
-    class: 'widget-region-three'
+    class: 'widget-region-three first-child--mt-0'
   });
   const fourthColumn = writer.createElement('ubcColumnsFourColumn', {
-    class: 'widget-region-four'
+    class: 'widget-region-four first-child--mt-0'
   });
   const wrapper = writer.createElement('ubcColumnsFourWrapper', defaultColumnsGapStyle, {
     class: 'widget--md--grid'

diff --git a/js/ckeditor5_plugins/ubcColumnsFour/src/ubccolumnsfourediting.js b/js/ckeditor5_plugins/ubcColumnsFour/src/ubccolumnsfourediting.js
@@ -164,7 +164,11 @@ export default class UbcColumnsFourEditing extends Plugin {
     // <ubcColumnsFourColumn> model, provided it is a child element of <ubcColumnsFour>,
     // as required by the schema.
     conversion.for('upcast').elementToElement({
-      model: 'ubcColumnsFourColumn',
+      model: (viewElement, { writer }) => {
+        return writer.createElement('ubcColumnsFourColumn', {
+            class: viewElement.getAttribute('class')
+        });
+      },
       view: {
         name: 'div',
         classes: ['first-child--mt-0'],

diff --git a/js/ckeditor5_plugins/ubcColumnsThree/src/ubccolumnsthreecommand.js b/js/ckeditor5_plugins/ubcColumnsThree/src/ubccolumnsthreecommand.js
@@ -77,13 +77,13 @@ function createUbcColumnsThree(writer) {
     class: 'widget-column-options widget-columns-3'
   });
   const firstColumn = writer.createElement('ubcColumnsThreeColumn', {
-    class: 'widget-region-one'
+    class: 'widget-region-one first-child--mt-0'
   });
   const secondColumn = writer.createElement('ubcColumnsThreeColumn', {
-    class: 'widget-region-two'
+    class: 'widget-region-two first-child--mt-0'
   });
   const thirdColumn = writer.createElement('ubcColumnsThreeColumn', {
-    class: 'widget-region-three'
+    class: 'widget-region-three first-child--mt-0'
   });
   const wrapper = writer.createElement('ubcColumnsThreeWrapper', defaultColumnsGapStyle, {
     class: 'widget--md--grid'

diff --git a/js/ckeditor5_plugins/ubcColumnsThree/src/ubccolumnsthreeediting.js b/js/ckeditor5_plugins/ubcColumnsThree/src/ubccolumnsthreeediting.js
@@ -159,7 +159,11 @@ export default class UbcColumnsThreeEditing extends Plugin {
     // <ubcColumnsThreeColumn> model, provided it is a child element of <ubcColumnsThree>,
     // as required by the schema.
     conversion.for('upcast').elementToElement({
-      model: 'ubcColumnsThreeColumn',
+      model: (viewElement, { writer }) => {
+        return writer.createElement('ubcColumnsThreeColumn', {
+            class: viewElement.getAttribute('class')
+        });
+      },
       view: {
         name: 'div',
         classes: ['first-child--mt-0'],

diff --git a/js/ckeditor5_plugins/ubcColumnsTwo/src/ubccolumnstwocommand.js b/js/ckeditor5_plugins/ubcColumnsTwo/src/ubccolumnstwocommand.js
@@ -78,10 +78,10 @@ function createUbcColumnsTwo(writer) {
     class: 'widget-column-options widget-columns-2'
   });
   const firstColumn = writer.createElement('ubcColumnsTwoColumn', {
-    class: 'widget-region-one'
+    class: 'widget-region-one first-child--mt-0'
   });
   const secondColumn = writer.createElement('ubcColumnsTwoColumn', {
-    class: 'widget-region-two'
+    class: 'widget-region-two first-child--mt-0'
   });
   const wrapper = writer.createElement('ubcColumnsTwoWrapper', defaultColumnsGapStyle, {
     class: 'widget--md--grid'

diff --git a/js/ckeditor5_plugins/ubcColumnsTwo/src/ubccolumnstwoediting.js b/js/ckeditor5_plugins/ubcColumnsTwo/src/ubccolumnstwoediting.js
@@ -155,7 +155,11 @@ export default class UbcColumnsTwoEditing extends Plugin {
     // <ubcColumnsTwoColumn> model, provided it is a child element of <ubcColumnsTwo>,
     // as required by the schema.
     conversion.for('upcast').elementToElement({
-      model: 'ubcColumnsTwoColumn',
+      model: (viewElement, { writer }) => {
+        return writer.createElement('ubcColumnsTwoColumn', {
+            class: viewElement.getAttribute('class')
+        });
+      },
       view: {
         name: 'div',
         classes: ['first-child--mt-0'],