From 4ae4f0c048afe4489a350395ec6736a1f779e928 Mon Sep 17 00:00:00 2001
From: Filip Sobol <filipsobol@users.noreply.github.com>
Date: Fri, 12 May 2023 13:33:31 +0200
Subject: [PATCH 1/3] Remove the `<style>` tag that comes with the table pasted
 from Google Sheets

---
 .../src/filters/removestyleblock.ts           | 23 +++++++++++
 .../src/normalizers/googlesheetsnormalizer.ts |  2 +
 ...oveboldwrapper.js => removeboldwrapper.js} |  0
 .../tests/filters/removestyleblock.js         | 41 +++++++++++++++++++
 4 files changed, 66 insertions(+)
 create mode 100644 packages/ckeditor5-paste-from-office/src/filters/removestyleblock.ts
 rename packages/ckeditor5-paste-from-office/tests/filters/{reomoveboldwrapper.js => removeboldwrapper.js} (100%)
 create mode 100644 packages/ckeditor5-paste-from-office/tests/filters/removestyleblock.js

diff --git a/packages/ckeditor5-paste-from-office/src/filters/removestyleblock.ts b/packages/ckeditor5-paste-from-office/src/filters/removestyleblock.ts
new file mode 100644
index 00000000000..fcb92cd0cb0
--- /dev/null
+++ b/packages/ckeditor5-paste-from-office/src/filters/removestyleblock.ts
@@ -0,0 +1,23 @@
+/**
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
+ */
+
+/**
+ * @module paste-from-office/filters/removestyleblock
+ */
+
+import type { UpcastWriter, ViewDocumentFragment } from 'ckeditor5/src/engine';
+
+/**
+ * Removes `<style>` block added by Google Sheets to a copied content.
+ *
+ * @param documentFragment element `data.content` obtained from clipboard
+ */
+export default function removeStyleBlock( documentFragment: ViewDocumentFragment, writer: UpcastWriter ): void {
+	for ( const child of documentFragment.getChildren() ) {
+		if ( child.is( 'element', 'style' ) ) {
+			writer.remove( child );
+		}
+	}
+}
diff --git a/packages/ckeditor5-paste-from-office/src/normalizers/googlesheetsnormalizer.ts b/packages/ckeditor5-paste-from-office/src/normalizers/googlesheetsnormalizer.ts
index e17717cf60d..0332b06ba60 100644
--- a/packages/ckeditor5-paste-from-office/src/normalizers/googlesheetsnormalizer.ts
+++ b/packages/ckeditor5-paste-from-office/src/normalizers/googlesheetsnormalizer.ts
@@ -12,6 +12,7 @@ import { UpcastWriter, type ViewDocument } from 'ckeditor5/src/engine';
 import removeXmlns from '../filters/removexmlns';
 import removeGoogleSheetsTag from '../filters/removegooglesheetstag';
 import removeInvalidTableWidth from '../filters/removeinvalidtablewidth';
+import removeStyleBlock from '../filters/removestyleblock';
 import type { Normalizer, NormalizerData } from '../normalizer';
 
 const googleSheetsMatch = /<google-sheets-html-origin/i;
@@ -48,6 +49,7 @@ export default class GoogleSheetsNormalizer implements Normalizer {
 		removeGoogleSheetsTag( documentFragment, writer );
 		removeXmlns( documentFragment, writer );
 		removeInvalidTableWidth( documentFragment, writer );
+		removeStyleBlock( documentFragment, writer );
 
 		data.content = documentFragment;
 	}
diff --git a/packages/ckeditor5-paste-from-office/tests/filters/reomoveboldwrapper.js b/packages/ckeditor5-paste-from-office/tests/filters/removeboldwrapper.js
similarity index 100%
rename from packages/ckeditor5-paste-from-office/tests/filters/reomoveboldwrapper.js
rename to packages/ckeditor5-paste-from-office/tests/filters/removeboldwrapper.js
diff --git a/packages/ckeditor5-paste-from-office/tests/filters/removestyleblock.js b/packages/ckeditor5-paste-from-office/tests/filters/removestyleblock.js
new file mode 100644
index 00000000000..7acd0294508
--- /dev/null
+++ b/packages/ckeditor5-paste-from-office/tests/filters/removestyleblock.js
@@ -0,0 +1,41 @@
+/**
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
+ */
+
+import HtmlDataProcessor from '@ckeditor/ckeditor5-engine/src/dataprocessor/htmldataprocessor';
+import removeStyleBlock from '../../src/filters/removestyleblock';
+import UpcastWriter from '@ckeditor/ckeditor5-engine/src/view/upcastwriter';
+import Document from '@ckeditor/ckeditor5-engine/src/view/document';
+import { StylesProcessor } from '@ckeditor/ckeditor5-engine/src/view/stylesmap';
+
+describe( 'PasteFromOffice - filters', () => {
+	const htmlDataProcessor = new HtmlDataProcessor( new Document( new StylesProcessor() ) );
+
+	describe( 'removeStyleBlock', () => {
+		let writer, viewDocument;
+
+		before( () => {
+			viewDocument = new Document();
+			writer = new UpcastWriter( viewDocument );
+		} );
+
+		it( 'should remove google sheets element', () => {
+			const inputData =
+				'<style type="text/css"><!--td {border: 1px solid #cccccc;}br {mso-data-placement:same-cell;}--></style>' +
+				'<table>' +
+					'<tbody>' +
+						'<tr>' +
+							'<td>123</td>' +
+						'</tr>' +
+					'</tbody>' +
+				'</table>';
+
+			const documentFragment = htmlDataProcessor.toView( inputData );
+
+			removeStyleBlock( documentFragment, writer );
+
+			expect( htmlDataProcessor.toData( documentFragment ) ).to.equal( '<table><tbody><tr><td>123</td></tr></tbody></table>' );
+		} );
+	} );
+} );

From 540557725003f3196392749e4c71f2a50084b3a8 Mon Sep 17 00:00:00 2001
From: Filip Sobol <filipsobol@users.noreply.github.com>
Date: Fri, 12 May 2023 13:35:27 +0200
Subject: [PATCH 2/3] Update test name

---
 .../tests/filters/removestyleblock.js                           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/ckeditor5-paste-from-office/tests/filters/removestyleblock.js b/packages/ckeditor5-paste-from-office/tests/filters/removestyleblock.js
index 7acd0294508..ecf71738d55 100644
--- a/packages/ckeditor5-paste-from-office/tests/filters/removestyleblock.js
+++ b/packages/ckeditor5-paste-from-office/tests/filters/removestyleblock.js
@@ -20,7 +20,7 @@ describe( 'PasteFromOffice - filters', () => {
 			writer = new UpcastWriter( viewDocument );
 		} );
 
-		it( 'should remove google sheets element', () => {
+		it( 'should remove <style> element', () => {
 			const inputData =
 				'<style type="text/css"><!--td {border: 1px solid #cccccc;}br {mso-data-placement:same-cell;}--></style>' +
 				'<table>' +

From 26a76e6ce19e48a31a770cb1b90e656a3ce37cec Mon Sep 17 00:00:00 2001
From: Filip Sobol <filipsobol@users.noreply.github.com>
Date: Thu, 18 May 2023 11:26:14 +0200
Subject: [PATCH 3/3] Test removing multiple `<style>` blocks

---
 .../src/filters/removestyleblock.ts           |  2 +-
 .../tests/filters/removestyleblock.js         | 39 +++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/packages/ckeditor5-paste-from-office/src/filters/removestyleblock.ts b/packages/ckeditor5-paste-from-office/src/filters/removestyleblock.ts
index fcb92cd0cb0..90dd9e4a9cd 100644
--- a/packages/ckeditor5-paste-from-office/src/filters/removestyleblock.ts
+++ b/packages/ckeditor5-paste-from-office/src/filters/removestyleblock.ts
@@ -15,7 +15,7 @@ import type { UpcastWriter, ViewDocumentFragment } from 'ckeditor5/src/engine';
  * @param documentFragment element `data.content` obtained from clipboard
  */
 export default function removeStyleBlock( documentFragment: ViewDocumentFragment, writer: UpcastWriter ): void {
-	for ( const child of documentFragment.getChildren() ) {
+	for ( const child of Array.from( documentFragment.getChildren() ) ) {
 		if ( child.is( 'element', 'style' ) ) {
 			writer.remove( child );
 		}
diff --git a/packages/ckeditor5-paste-from-office/tests/filters/removestyleblock.js b/packages/ckeditor5-paste-from-office/tests/filters/removestyleblock.js
index ecf71738d55..a7ce9df477a 100644
--- a/packages/ckeditor5-paste-from-office/tests/filters/removestyleblock.js
+++ b/packages/ckeditor5-paste-from-office/tests/filters/removestyleblock.js
@@ -37,5 +37,44 @@ describe( 'PasteFromOffice - filters', () => {
 
 			expect( htmlDataProcessor.toData( documentFragment ) ).to.equal( '<table><tbody><tr><td>123</td></tr></tbody></table>' );
 		} );
+
+		it( 'works with multiple consecutive <style> tags', () => {
+			const inputData =
+				'<style type="text/css"><!--td {border: 1px solid #cccccc;}br {mso-data-placement:same-cell;}--></style>' +
+				'<style type="text/css"><!--td {border: 1px solid #cccccc;}br {mso-data-placement:same-cell;}--></style>' +
+				'<style type="text/css"><!--td {border: 1px solid #cccccc;}br {mso-data-placement:same-cell;}--></style>' +
+				'<table>' +
+					'<tbody>' +
+						'<tr>' +
+							'<td>123</td>' +
+						'</tr>' +
+					'</tbody>' +
+				'</table>';
+
+			const documentFragment = htmlDataProcessor.toView( inputData );
+
+			removeStyleBlock( documentFragment, writer );
+
+			expect( htmlDataProcessor.toData( documentFragment ) ).to.equal( '<table><tbody><tr><td>123</td></tr></tbody></table>' );
+		} );
+
+		it( 'works with multiple non-consecutive <style> tags', () => {
+			const inputData =
+				'<style type="text/css"><!--td {border: 1px solid #cccccc;}br {mso-data-placement:same-cell;}--></style>' +
+				'<table>' +
+					'<tbody>' +
+						'<tr>' +
+							'<td>123</td>' +
+						'</tr>' +
+					'</tbody>' +
+				'</table>' +
+				'<style type="text/css"><!--td {border: 1px solid #cccccc;}br {mso-data-placement:same-cell;}--></style>';
+
+			const documentFragment = htmlDataProcessor.toView( inputData );
+
+			removeStyleBlock( documentFragment, writer );
+
+			expect( htmlDataProcessor.toData( documentFragment ) ).to.equal( '<table><tbody><tr><td>123</td></tr></tbody></table>' );
+		} );
 	} );
 } );