Merge pull request #180 from nzzdev/release-7.0.2

Release 7.0.2
nzzdev · Nov 1, 2022 · 13dc34f · 13dc34f
2 parents 647853c + 96f2aa5
commit 13dc34f
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 76 deletions.
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -3,4 +3,4 @@
 
 npm run build
 
-npm run prettier-format && npm run lint:all && npm run jest
+npm run lint:all && npm run jest
diff --git a/.prettierrc.cjs b/.prettierrc.cjs
diff --git a/dist/Q-Table.js b/dist/Q-Table.js
diff --git a/dist/routes.js b/dist/routes.js
@@ -2507,7 +2507,7 @@ const route$f = {
           })();`,
                     },
                 ],
-                markup: `<div id="${id}_container" class="q-table-container" />`,
+                markup: `<div id="${id}_container" class="q-table-container"></div>`,
             };
             if (styleHashMap !== null) {
                 renderingInfo.stylesheets.push({

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "q-table",
-  "version": "7.0.1",
+  "version": "7.0.2",
   "description": "",
   "main": "index.js",
   "type": "module",
@@ -12,7 +12,6 @@
     "lint": "eslint --fix --ext .svelte,.ts --config src/.eslintrc.cjs src",
     "lint:all": "run-s -c lint ts-check svelte-check",
     "prepare": "husky install",
-    "prettier-format": "prettier --write src/",
     "start": "nodemon --exec \"npm run dev\"",
     "svelte-check": "svelte-check",
     "test": "npm run build && npm run jest",
@@ -63,8 +62,6 @@
     "npm-run-all": "^4.1.5",
     "postcss": "^8.4.16",
     "postcss-import": "^15.0.0",
-    "prettier": "^2.7.1",
-    "prettier-plugin-svelte": "^2.7.0",
     "rollup": "^2.79.1",
     "rollup-plugin-svelte": "^7.1.0",
     "rollup-plugin-terser": "^7.0.2",

diff --git a/src/components/legend/CategoricalLegend.svelte b/src/components/legend/CategoricalLegend.svelte
@@ -13,12 +13,12 @@ const legendData = colorColumn.legend as CategoricalLegend;
     {#each legendData.categories as category}
       {#if category.color.customColor}
         <div class="s-legend-item-label__item" style="color: {category.color.customColor}">
-          <div class="s-legend-item-label__item__icon s-legend-item-label__item__icon--default" />
+          <div class="s-legend-item-label__item__icon s-legend-item-label__item__icon--default"></div>
           <div class="s-legend-item-label__item__label">{category.label}</div>
         </div>
       {:else}
         <div class="s-legend-item-label__item {category.color.colorClass}">
-          <div class="s-legend-item-label__item__icon s-legend-item-label__item__icon--default" />
+          <div class="s-legend-item-label__item__icon s-legend-item-label__item__icon--default"></div>
           <div class="s-legend-item-label__item__label">{category.label}</div>
         </div>
       {/if}

diff --git a/src/components/legend/NumericalLegend.svelte b/src/components/legend/NumericalLegend.svelte
@@ -57,7 +57,7 @@ function getBucketWidth(bucket: Bucket, minVal: number, maxVal: number): number
           </g>
         {/if}
       </svg>
-      <div class="q-table-colorColumn-legend-borders s-color-gray-6" />
+      <div class="q-table-colorColumn-legend-borders s-color-gray-6"></div>
     </div>
 
     {#if labelLegend !== null}

diff --git a/src/components/methodbox/MethodBox.svelte b/src/components/methodbox/MethodBox.svelte
@@ -22,9 +22,9 @@ const formattedBuckets = methodBox.formattedBuckets;
               {#if bucket.color.customColor}
                 <div
                   class="q-table-methods-circle-static s-legend-item-label__item__icon s-legend-item-label__item__icon--default"
-                  style="color: {bucket.color.customColor}" />
+                  style="color: {bucket.color.customColor}"></div>
               {:else}
-                <div class="q-table-methods-circle-static s-legend-item-label__item__icon s-legend-item-label__item__icon--default {bucket.color.colorClass}" />
+                <div class="q-table-methods-circle-static s-legend-item-label__item__icon s-legend-item-label__item__icon--default {bucket.color.colorClass}"></div>
               {/if}
               <div class="s-legend-item-label__item__label s-font-note--tabularnums">
                 {#if bucketIndex === 0 && legend.hasSingleValueBucket}
@@ -60,7 +60,7 @@ const formattedBuckets = methodBox.formattedBuckets;
                   class="{bucket.color.colorClass !== undefined ? bucket.color.colorClass : ''}
                   q-table-methods-circle
                   q-table-methods-circle--circle-fill"
-                  style="color: {bucket.color.customColor !== undefined ? bucket.color.customColor : ''}" />
+                  style="color: {bucket.color.customColor !== undefined ? bucket.color.customColor : ''}"></div>
               </td>
               {#if bucketIndex === 0 && legend.hasSingleValueBucket}
                 <td />

diff --git a/src/components/minibar/MinibarBox.svelte b/src/components/minibar/MinibarBox.svelte
@@ -48,6 +48,6 @@ function getMinibarClassName(): string {
 
 {#if minibar && item.options.minibar.selectedColumn === colIndex}
   <td class="q-table-minibar-cell" data-minibar={minibar.type} style={getCellStyle()}>
-    <div class="q-table-minibar-bar--{minibar.values[rowIndex].type} {getMinibarClassName()}" style={getBarStyle()} />
+    <div class="q-table-minibar-bar--{minibar.values[rowIndex].type} {getMinibarClassName()}" style={getBarStyle()}></div>
   </td>
 {/if}
diff --git a/src/components/minibar/MixedMinibars.svelte b/src/components/minibar/MixedMinibars.svelte
@@ -89,7 +89,7 @@ function getMinibarClassName(): string {
       <div
         data-minibar={minibar.values[rowIndex].type}
         class="q-table-minibar-bar--{minibar.values[rowIndex].type} q-table-minibar--{minibar.values[rowIndex].type} {getMinibarClassName()}"
-        style="width: {minibar.values[rowIndex].value}%; background-color: {getMinibarColor()}" />
+        style="width: {minibar.values[rowIndex].value}%; background-color: {getMinibarColor()}"></div>
     {/if}
   {/if}
 </td>
diff --git a/src/routes/rendering-info/web.ts b/src/routes/rendering-info/web.ts
@@ -156,7 +156,7 @@ const route: ServerRoute = {
           })();`,
         },
       ],
-      markup: `<div id="${id}_container" class="q-table-container" />`,
+      markup: `<div id="${id}_container" class="q-table-container"></div>`,
     };
 
     if (styleHashMap !== null) {

diff --git a/tests/dom-tests.spec.ts b/tests/dom-tests.spec.ts
@@ -268,7 +268,7 @@ describe('cardlayout on mobile', () => {
 
     const markup = createMarkupWithScript(response);
     const dom = createDOM(markup);
-    const includedClass = dom.window.document.body.innerHTML.includes('q-table--card-layout');
+    const includedClass = dom.window.document.body.querySelector(".q-table-container")?.innerHTML.includes('q-table--card-layout');
 
     expect(includedClass).toEqual(true);
   });
@@ -285,7 +285,7 @@ describe('cardlayout on mobile', () => {
 
     const markup = createMarkupWithScript(response);
     const dom = createDOM(markup);
-    const includedClass = dom.window.document.body.innerHTML.includes('q-table--card-layout');
+    const includedClass = dom.window.document.body.querySelector(".q-table-container")?.innerHTML.includes('q-table--card-layout');
 
     expect(includedClass).toEqual(false);
   });
@@ -302,7 +302,7 @@ describe('cardlayout on mobile', () => {
 
     const markup = createMarkupWithScript(response);
     const dom = createDOM(markup);
-    const includedClass = dom.window.document.body.innerHTML.includes('q-table--card-layout');
+    const includedClass = dom.window.document.body.querySelector(".q-table-container")?.innerHTML.includes('q-table--card-layout');
 
     expect(includedClass).toEqual(false);
   });