@adobe/helix-importer 3.4.76 → 3.4.78

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,3 +1,17 @@
1
+ ## [3.4.78](https://github.com/adobe/helix-importer/compare/v3.4.77...v3.4.78) (2025-03-26)
2
+
3
+
4
+ ### Bug Fixes
5
+
6
+ * ensure row- and colspans are numbers ([#517](https://github.com/adobe/helix-importer/issues/517)) ([a853ee9](https://github.com/adobe/helix-importer/commit/a853ee931ee70871fe0a35b17726b7fd7f81750b))
7
+
8
+ ## [3.4.77](https://github.com/adobe/helix-importer/compare/v3.4.76...v3.4.77) (2025-03-25)
9
+
10
+
11
+ ### Bug Fixes
12
+
13
+ * **deps:** update adobe fixes ([#516](https://github.com/adobe/helix-importer/issues/516)) ([faba367](https://github.com/adobe/helix-importer/commit/faba3678e3a47cf1fd312d11def101030854d9e8))
14
+
1
15
  ## [3.4.76](https://github.com/adobe/helix-importer/compare/v3.4.75...v3.4.76) (2025-03-25)
2
16
 
3
17
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@adobe/helix-importer",
3
- "version": "3.4.76",
3
+ "version": "3.4.78",
4
4
  "description": "Helix Importer tool: create md / docx from html",
5
5
  "main": "src/index.js",
6
6
  "type": "module",
@@ -27,8 +27,8 @@
27
27
  },
28
28
  "devDependencies": {
29
29
  "@adobe/eslint-config-helix": "2.0.9",
30
- "@adobe/helix-docx2md": "1.6.25",
31
- "@adobe/helix-mediahandler": "2.6.7",
30
+ "@adobe/helix-docx2md": "1.6.26",
31
+ "@adobe/helix-mediahandler": "2.6.8",
32
32
  "@esm-bundle/chai": "4.3.4-fix.0",
33
33
  "@semantic-release/changelog": "6.0.3",
34
34
  "@semantic-release/exec": "6.0.3",
@@ -53,8 +53,8 @@
53
53
  "license": "Apache-2.0",
54
54
  "dependencies": {
55
55
  "@adobe/helix-markdown-support": "7.1.12",
56
- "@adobe/helix-md2docx": "2.2.6",
57
- "@adobe/helix-md2jcr": "1.1.9",
56
+ "@adobe/helix-md2docx": "2.2.7",
57
+ "@adobe/helix-md2jcr": "1.1.10",
58
58
  "@adobe/mdast-util-gridtables": "4.0.11",
59
59
  "@adobe/remark-gridtables": "3.0.12",
60
60
  "form-data": "4.0.2",
@@ -97,6 +97,12 @@ function cell(state, node, parent) {
97
97
  }
98
98
  }
99
99
  }
100
+ if (typeof props.colSpan === 'string') {
101
+ props.colSpan = parseInt(props.colSpan, 10);
102
+ }
103
+ if (typeof props.rowSpan === 'string') {
104
+ props.rowSpan = parseInt(props.rowSpan, 10);
105
+ }
100
106
  return {
101
107
  type: TYPE_CELL,
102
108
  children: state.all(node),
@@ -242,6 +242,10 @@ describe('PageImporter tests - fixtures', () => {
242
242
  await featureTest('subsup');
243
243
  });
244
244
 
245
+ it('import - row and colspan in tables', async () => {
246
+ await featureTest('tables');
247
+ });
248
+
245
249
  it('import - images', async () => {
246
250
  await featureTest('img', (got, want) => {
247
251
  if (got.indexOf(want) !== 0) {
@@ -0,0 +1,40 @@
1
+ <html>
2
+ <body>
3
+ <main>
4
+ <div><table border="1"><thead><tr><th>Table</th></tr></thead><tbody><tr><td><table border="1" class="staticTable" style="margin-bottom: 0;">
5
+ <tbody>
6
+ <tr>
7
+ <th colspan="2" rowspan="2"></th>
8
+ <th colspan="2">foo heading</th>
9
+ </tr>
10
+ <tr>
11
+ <th colspan="2"><strong>bar heading</strong></th>
12
+ </tr>
13
+ <tr>
14
+ <td>1</td>
15
+ <td>2</td>
16
+ <td>3</td>
17
+ <td>4</td>
18
+ </tr>
19
+ </tbody></table></td></tr></tbody></table>
20
+ </div>
21
+
22
+ <div><table border="1"><thead><tr><th>Table</th></tr></thead><tbody><tr><td><table border="1" class="staticTable" style="margin-bottom: 0;">
23
+ <tbody>
24
+ <tr>
25
+ <th colspan="2" rowspan="2"></th>
26
+ <th colspan="1">foo heading</th>
27
+ </tr>
28
+ <tr>
29
+ <th colspan="1"><strong>bar heading</strong></th>
30
+ </tr>
31
+ <tr>
32
+ <td>1</td>
33
+ <td>2</td>
34
+ <td>3</td>
35
+ </tr>
36
+ </tbody></table></td></tr></tbody></table>
37
+ </div>
38
+ </main>
39
+ </body>
40
+ </html>
@@ -0,0 +1,23 @@
1
+ +-----------------------------+
2
+ | Table |
3
+ +=============================+
4
+ | +-------+-----------------+ |
5
+ | | | foo heading | |
6
+ | | +-----------------+ |
7
+ | | | **bar heading** | |
8
+ | +===+===+========+========+ |
9
+ | | 1 | 2 | 3 | 4 | |
10
+ | +---+---+--------+--------+ |
11
+ +-----------------------------+
12
+
13
+ +-----------------------------+
14
+ | Table |
15
+ +=============================+
16
+ | +-------+-----------------+ |
17
+ | | | foo heading | |
18
+ | | +-----------------+ |
19
+ | | | **bar heading** | |
20
+ | +===+===+=================+ |
21
+ | | 1 | 2 | 3 | |
22
+ | +---+---+-----------------+ |
23
+ +-----------------------------+