From a1150d47a1cb5f6a77347886c07eee615f95bbf5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Mar 2023 06:57:22 +0000
Subject: [PATCH 01/17] chore(deps-dev): Bump @nextcloud/webpack-vue-config

Bumps [@nextcloud/webpack-vue-config](https://github.com/nextcloud/webpack-vue-config) from `62f0c1a` to `841abf3`.
- [Release notes](https://github.com/nextcloud/webpack-vue-config/releases)
- [Commits](https://github.com/nextcloud/webpack-vue-config/compare/62f0c1a419579ed950ba39ecbd7ae7119fb565a1...841abf3c3505d17d478b2149004448127f0bcc29)

---
updated-dependencies:
- dependency-name: "@nextcloud/webpack-vue-config"
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index dab570ee..4f158fed 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3168,7 +3168,7 @@
 		},
 		"node_modules/@nextcloud/webpack-vue-config": {
 			"version": "5.5.0",
-			"resolved": "git+ssh://git@github.com/nextcloud/webpack-vue-config.git#62f0c1a419579ed950ba39ecbd7ae7119fb565a1",
+			"resolved": "git+ssh://git@github.com/nextcloud/webpack-vue-config.git#841abf3c3505d17d478b2149004448127f0bcc29",
 			"integrity": "sha512-bKlGYEqblSiSHNmpaGM9fz/f9v6JNwHp63V63yaI26gE0Zs+DpZSzJWC6HWWbJ1BgmoKT7wLN1GJc4W/NxvnxQ==",
 			"dev": true,
 			"license": "AGPL-3.0-or-later",
@@ -29406,10 +29406,10 @@
 			"requires": {}
 		},
 		"@nextcloud/webpack-vue-config": {
-			"version": "git+ssh://git@github.com/nextcloud/webpack-vue-config.git#62f0c1a419579ed950ba39ecbd7ae7119fb565a1",
+			"version": "git+ssh://git@github.com/nextcloud/webpack-vue-config.git#841abf3c3505d17d478b2149004448127f0bcc29",
 			"integrity": "sha512-bKlGYEqblSiSHNmpaGM9fz/f9v6JNwHp63V63yaI26gE0Zs+DpZSzJWC6HWWbJ1BgmoKT7wLN1GJc4W/NxvnxQ==",
 			"dev": true,
-			"from": "@nextcloud/webpack-vue-config@github:nextcloud/webpack-vue-config#62f0c1a419579ed950ba39ecbd7ae7119fb565a1",
+			"from": "@nextcloud/webpack-vue-config@github:nextcloud/webpack-vue-config#841abf3c3505d17d478b2149004448127f0bcc29",
 			"requires": {}
 		},
 		"@nicolo-ribaudo/eslint-scope-5-internals": {

From bdce1a6f7bc54c3b49dd428ef21af277f08b9774 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Mar 2023 06:58:16 +0000
Subject: [PATCH 02/17] chore(deps): Bump linkify-string from 4.1.0 to 4.1.1

Bumps [linkify-string](https://github.com/Hypercontext/linkifyjs/tree/HEAD/packages/linkify-string) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/Hypercontext/linkifyjs/releases)
- [Changelog](https://github.com/Hypercontext/linkifyjs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Hypercontext/linkifyjs/commits/v4.1.1/packages/linkify-string)

---
updated-dependencies:
- dependency-name: linkify-string
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index dab570ee..18416f84 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15899,9 +15899,9 @@
 			"dev": true
 		},
 		"node_modules/linkify-string": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/linkify-string/-/linkify-string-4.1.0.tgz",
-			"integrity": "sha512-mw4KyPoE/vP0lamGbFFtDsutxOw0b+3g2/lH5bwS7X4tRHQyLBoJ60avPVGUoHfU8G1bLS329u13hhpxBIqFiA==",
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/linkify-string/-/linkify-string-4.1.1.tgz",
+			"integrity": "sha512-9+kj8xr7GLiyNyO9ri7lIxq2ixVYjjqvtomPQpeYNNT56/PxQq6utzXFLm8HxOaGTiMpimj1UAQWwYYPV88L1g==",
 			"peerDependencies": {
 				"linkifyjs": "^4.0.0"
 			}
@@ -39222,9 +39222,9 @@
 			"dev": true
 		},
 		"linkify-string": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/linkify-string/-/linkify-string-4.1.0.tgz",
-			"integrity": "sha512-mw4KyPoE/vP0lamGbFFtDsutxOw0b+3g2/lH5bwS7X4tRHQyLBoJ60avPVGUoHfU8G1bLS329u13hhpxBIqFiA==",
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/linkify-string/-/linkify-string-4.1.1.tgz",
+			"integrity": "sha512-9+kj8xr7GLiyNyO9ri7lIxq2ixVYjjqvtomPQpeYNNT56/PxQq6utzXFLm8HxOaGTiMpimj1UAQWwYYPV88L1g==",
 			"requires": {}
 		},
 		"linkifyjs": {

From 1b01dc392c636084f714b2435e0a47bb87bef8bc Mon Sep 17 00:00:00 2001
From: Julien Veyssier <julien-nc@posteo.net>
Date: Mon, 27 Mar 2023 18:20:04 +0200
Subject: [PATCH 03/17] import missing style file in NcRichText.vue

Signed-off-by: Julien Veyssier <julien-nc@posteo.net>
---
 src/components/NcRichText/NcRichText.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/NcRichText/NcRichText.vue b/src/components/NcRichText/NcRichText.vue
index 9b7ceea6..31046ce2 100644
--- a/src/components/NcRichText/NcRichText.vue
+++ b/src/components/NcRichText/NcRichText.vue
@@ -238,6 +238,8 @@ export default {
 }
 </script>
 <style scoped>
+@import './richtext.scss';
+
 a:not(.rich-text--component) {
 	text-decoration: underline;
 }

From 13df4f9b694de7184cf0d4b2a700a67a7c5b9b4d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 Mar 2023 06:57:53 +0000
Subject: [PATCH 04/17] chore(deps): Bump @nextcloud/calendar-js from 5.0.4 to
 6.0.0

Bumps [@nextcloud/calendar-js](https://github.com/nextcloud/calendar-js) from 5.0.4 to 6.0.0.
- [Release notes](https://github.com/nextcloud/calendar-js/releases)
- [Changelog](https://github.com/nextcloud/calendar-js/blob/main/CHANGELOG.md)
- [Commits](https://github.com/nextcloud/calendar-js/compare/v5.0.4...v6.0.0)

---
updated-dependencies:
- dependency-name: "@nextcloud/calendar-js"
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 62 ++++++++++++++++++++++++++++++++++++-----------
 package.json      |  2 +-
 2 files changed, 49 insertions(+), 15 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 442e2c31..a42b1007 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,7 +13,7 @@
 				"@nextcloud/auth": "^2.0.0",
 				"@nextcloud/axios": "^2.0.0",
 				"@nextcloud/browser-storage": "^0.2.0",
-				"@nextcloud/calendar-js": "^5.0.3",
+				"@nextcloud/calendar-js": "^6.0.0",
 				"@nextcloud/capabilities": "^1.0.4",
 				"@nextcloud/dialogs": "^4.0.0",
 				"@nextcloud/event-bus": "^3.0.0",
@@ -1887,6 +1887,15 @@
 				"node": ">= 0.12"
 			}
 		},
+		"node_modules/@cypress/request/node_modules/uuid": {
+			"version": "8.3.2",
+			"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+			"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+			"dev": true,
+			"bin": {
+				"uuid": "dist/bin/uuid"
+			}
+		},
 		"node_modules/@cypress/vue2": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/@cypress/vue2/-/vue2-2.0.1.tgz",
@@ -2949,16 +2958,16 @@
 			}
 		},
 		"node_modules/@nextcloud/calendar-js": {
-			"version": "5.0.4",
-			"resolved": "https://registry.npmjs.org/@nextcloud/calendar-js/-/calendar-js-5.0.4.tgz",
-			"integrity": "sha512-/vQlQZL59wSEI8YRhae1vumSq4iY7dxueytH7HsPzdE8C1iX3qJdMANQflSQfFpd8u9gUfuyRD+/RsguKjNeKw==",
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/@nextcloud/calendar-js/-/calendar-js-6.0.0.tgz",
+			"integrity": "sha512-kZBRFIG8J3TNU6K92iEpNzBa3r9JbpCr1MZFJHqVy/5+xTtQG9FqsHhqUWptPwLEBhUNMwN+oCCa7QJAnBKKyg==",
 			"engines": {
 				"node": ">=16.0.0",
 				"npm": ">=8.0.0"
 			},
 			"peerDependencies": {
 				"ical.js": "^1.5.0",
-				"uuid": "^8.3.2"
+				"uuid": "^9.0.0"
 			}
 		},
 		"node_modules/@nextcloud/capabilities": {
@@ -21504,6 +21513,15 @@
 				"ms": "^2.1.1"
 			}
 		},
+		"node_modules/sockjs/node_modules/uuid": {
+			"version": "8.3.2",
+			"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+			"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+			"dev": true,
+			"bin": {
+				"uuid": "dist/bin/uuid"
+			}
+		},
 		"node_modules/source-list-map": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
@@ -23958,9 +23976,10 @@
 			}
 		},
 		"node_modules/uuid": {
-			"version": "8.3.2",
-			"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-			"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+			"version": "9.0.0",
+			"resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz",
+			"integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==",
+			"peer": true,
 			"bin": {
 				"uuid": "dist/bin/uuid"
 			}
@@ -28432,6 +28451,12 @@
 						"combined-stream": "^1.0.6",
 						"mime-types": "^2.1.12"
 					}
+				},
+				"uuid": {
+					"version": "8.3.2",
+					"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+					"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+					"dev": true
 				}
 			}
 		},
@@ -29257,9 +29282,9 @@
 			"dev": true
 		},
 		"@nextcloud/calendar-js": {
-			"version": "5.0.4",
-			"resolved": "https://registry.npmjs.org/@nextcloud/calendar-js/-/calendar-js-5.0.4.tgz",
-			"integrity": "sha512-/vQlQZL59wSEI8YRhae1vumSq4iY7dxueytH7HsPzdE8C1iX3qJdMANQflSQfFpd8u9gUfuyRD+/RsguKjNeKw==",
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/@nextcloud/calendar-js/-/calendar-js-6.0.0.tgz",
+			"integrity": "sha512-kZBRFIG8J3TNU6K92iEpNzBa3r9JbpCr1MZFJHqVy/5+xTtQG9FqsHhqUWptPwLEBhUNMwN+oCCa7QJAnBKKyg==",
 			"requires": {}
 		},
 		"@nextcloud/capabilities": {
@@ -43423,6 +43448,14 @@
 				"faye-websocket": "^0.11.3",
 				"uuid": "^8.3.2",
 				"websocket-driver": "^0.7.4"
+			},
+			"dependencies": {
+				"uuid": {
+					"version": "8.3.2",
+					"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+					"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+					"dev": true
+				}
 			}
 		},
 		"sockjs-client": {
@@ -45340,9 +45373,10 @@
 			"dev": true
 		},
 		"uuid": {
-			"version": "8.3.2",
-			"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-			"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
+			"version": "9.0.0",
+			"resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz",
+			"integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==",
+			"peer": true
 		},
 		"uvu": {
 			"version": "0.5.6",
diff --git a/package.json b/package.json
index 5524317e..8c1311f0 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
 		"@nextcloud/auth": "^2.0.0",
 		"@nextcloud/axios": "^2.0.0",
 		"@nextcloud/browser-storage": "^0.2.0",
-		"@nextcloud/calendar-js": "^5.0.3",
+		"@nextcloud/calendar-js": "^6.0.0",
 		"@nextcloud/capabilities": "^1.0.4",
 		"@nextcloud/dialogs": "^4.0.0",
 		"@nextcloud/event-bus": "^3.0.0",

From b2d185f6ff6b68d072625017fd0801fe463ca3b1 Mon Sep 17 00:00:00 2001
From: Julien Veyssier <julien-nc@posteo.net>
Date: Tue, 28 Mar 2023 11:21:43 +0200
Subject: [PATCH 05/17] fix class of NcLink being overriden because it is not
 functional anymore

Signed-off-by: Julien Veyssier <julien-nc@posteo.net>
---
 src/components/NcRichText/NcRichText.vue | 1 +
 src/components/NcRichText/placeholder.js | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/NcRichText/NcRichText.vue b/src/components/NcRichText/NcRichText.vue
index 31046ce2..ec8dec61 100644
--- a/src/components/NcRichText/NcRichText.vue
+++ b/src/components/NcRichText/NcRichText.vue
@@ -238,6 +238,7 @@ export default {
 }
 </script>
 <style scoped>
+/* stylelint-disable-next-line scss/at-import-partial-extension */
 @import './richtext.scss';
 
 a:not(.rich-text--component) {
diff --git a/src/components/NcRichText/placeholder.js b/src/components/NcRichText/placeholder.js
index 435965bc..f2ee5b4f 100644
--- a/src/components/NcRichText/placeholder.js
+++ b/src/components/NcRichText/placeholder.js
@@ -44,9 +44,11 @@ export const prepareTextNode = ({ h, context }, text) => {
 				return entry
 			}
 			const { component, props } = entry
+			// do not override class of NcLink
+			const componentClass = component.name === 'NcLink' ? undefined : 'rich-text--component'
 			return h(component, {
 				props,
-				class: 'rich-text--component',
+				class: componentClass,
 			})
 		})
 	}

From 9c6ea0e0b9948041d0220f448aaf1cee48a1838b Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Tue, 28 Mar 2023 12:30:35 +0200
Subject: [PATCH 06/17] fix(NcRichText): Match IP addresses as links

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 src/components/NcRichText/NcRichText.vue         |  2 ++
 src/components/NcRichText/helpers.js             | 16 ++++++++++++++--
 .../components/NcRichText/NcRichText.spec.js     | 11 +++++++++++
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/components/NcRichText/NcRichText.vue b/src/components/NcRichText/NcRichText.vue
index 9b7ceea6..4143ea77 100644
--- a/src/components/NcRichText/NcRichText.vue
+++ b/src/components/NcRichText/NcRichText.vue
@@ -39,6 +39,8 @@ export default {
 		return {
 			text: `Hello {username}. The file {file} was added by {username}. Go visit https://nextcloud.com
 
+Local IP: http://127.0.0.1/status.php should be clickable
+
 Some examples for markdown syntax: **bold text** *italic text* ~~strikethrough~~`,
 			autolink: true,
 			useMarkdown: true,
diff --git a/src/components/NcRichText/helpers.js b/src/components/NcRichText/helpers.js
index 0f95e0f1..ef3f9d79 100644
--- a/src/components/NcRichText/helpers.js
+++ b/src/components/NcRichText/helpers.js
@@ -1,4 +1,16 @@
+/**
+ * Regex pattern to match links to be resolved by the link-reference provider
+ *
+ * @type {RegExp}
+ */
 export const URL_PATTERN = /(\s|^)(https?:\/\/)((?:[-A-Z0-9+_]+\.)+[-A-Z]+(?:\/[-A-Z0-9+&@#%?=~_|!:,.;()]*)*)(\s|$)/ig
 
-// FIXME See if we can merge those two
-export const URL_PATTERN_AUTOLINK = /(\s|\(|^)((https?:\/\/)((?:[-A-Z0-9+_]+\.)+[-A-Z]+(?::[0-9]+)?(?:\/[-A-Z0-9+&@#%?=~_|!:,.;()]*)*))(?=\s|\)|$)/ig
+/**
+ * Regex pattern to identify strings as links and then making them clickable
+ * Opposed to the above regex this one also matches IP addresses, which we would like to be clickable,
+ * but in general resolving references for them might mostly not work,
+ * as the link provider checks for local addresses and does not resolve them.
+ *
+ * @type {RegExp}
+ */
+export const URL_PATTERN_AUTOLINK = /(\s|\(|^)((https?:\/\/)((?:[-A-Z0-9+_]+\.)+[-A-Z0-9]+(?::[0-9]+)?(?:\/[-A-Z0-9+&@#%?=~_|!:,.;()]*)*))(?=\s|\)|$)/ig
diff --git a/tests/unit/components/NcRichText/NcRichText.spec.js b/tests/unit/components/NcRichText/NcRichText.spec.js
index aff94f61..75844281 100644
--- a/tests/unit/components/NcRichText/NcRichText.spec.js
+++ b/tests/unit/components/NcRichText/NcRichText.spec.js
@@ -152,6 +152,17 @@ describe('Foo', () => {
 		expect(wrapper.find('a').attributes('href')).toEqual('https://example.com:444')
 	})
 
+	it('properly recognizes an url with an IP address and inserts a link', async() => {
+		const wrapper = mount(NcRichText, {
+			propsData: {
+				text: 'Testwith a link to https://127.0.0.1/status.php - go visit it',
+				autolink: true
+			}
+		})
+		expect(wrapper.text()).toEqual('Testwith a link to https://127.0.0.1/status.php - go visit it')
+		expect(wrapper.find('a').attributes('href')).toEqual('https://127.0.0.1/status.php')
+	})
+
 	it('properly formats markdown', async() => {
 		const wrapper = mount(NcRichText, {
 			propsData: {

From 299a372a7a119febc4a264bf082708f0ea250415 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Tue, 28 Mar 2023 13:17:52 +0200
Subject: [PATCH 07/17] fix(NcRichContenteditable): Completely stop event
 propagation for keyup events

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 src/components/NcRichContenteditable/NcRichContenteditable.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/NcRichContenteditable/NcRichContenteditable.vue b/src/components/NcRichContenteditable/NcRichContenteditable.vue
index b9a690ab..0274bbde 100644
--- a/src/components/NcRichContenteditable/NcRichContenteditable.vue
+++ b/src/components/NcRichContenteditable/NcRichContenteditable.vue
@@ -660,6 +660,7 @@ export default {
 
 		onKeyUp(event) {
 			// prevent tribute from opening on keyup
+			event.stopImmediatePropagation()
 		},
 	},
 }

From cfb6a6779b9221d7b3b7bee84f6bb03724c263bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6?= <skjnldsv@protonmail.com>
Date: Tue, 28 Mar 2023 13:18:59 +0200
Subject: [PATCH 08/17] fix(NcButton): ellipsis text on small width
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
---
 src/components/NcButton/NcButton.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/NcButton/NcButton.vue b/src/components/NcButton/NcButton.vue
index 20198d6c..d7072689 100644
--- a/src/components/NcButton/NcButton.vue
+++ b/src/components/NcButton/NcButton.vue
@@ -430,6 +430,7 @@ export default {
 		display: inline-flex;
 		align-items: center;
 		justify-content: space-around;
+		width: 100%;
 	}
 
 	&__icon {
@@ -446,6 +447,9 @@ export default {
 		font-weight: bold;
 		margin-bottom: 1px;
 		padding: 2px 0;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		overflow: hidden;
 	}
 
 	// Icon-only button

From a223717c9358227b8ebe4b81e8cd26608d7268e2 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Tue, 28 Mar 2023 15:16:23 +0200
Subject: [PATCH 09/17] chore(release): Bump version to 7.8.5

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a42b1007..e2f9fa74 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "@nextcloud/vue",
-	"version": "7.8.4",
+	"version": "7.8.5",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "@nextcloud/vue",
-			"version": "7.8.4",
+			"version": "7.8.5",
 			"license": "AGPL-3.0",
 			"dependencies": {
 				"@floating-ui/dom": "^1.1.0",
diff --git a/package.json b/package.json
index 8c1311f0..0c668eb5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@nextcloud/vue",
-	"version": "7.8.4",
+	"version": "7.8.5",
 	"description": "Nextcloud vue components",
 	"keywords": [
 		"vuejs",

From 32beb5d72ffb61eed2bdd75bf12ad05bae445ac5 Mon Sep 17 00:00:00 2001
From: Grigorii Shartsev <grigorii.shartsev@nextcloud.com>
Date: Tue, 28 Mar 2023 03:35:09 +0200
Subject: [PATCH 10/17] fix(NcAppSIdebarTabs): fix dynamic tabs registration
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix: #3461

Signed-off-by: Grigorii Shartsev <grigorii.shartsev@nextcloud.com>

Co-authored-by: Raimund Schlüßler <raimund.schluessler@mailbox.org>
---
 src/components/NcAppSidebar/NcAppSidebar.vue  | 120 +++++++++++++++---
 .../NcAppSidebar/NcAppSidebarTabs.vue         | 108 +++++-----------
 .../NcAppSidebarTab/NcAppSidebarTab.vue       |  26 +++-
 .../NcAppSidebar/NcAppSidebarTabs.spec.js     |  19 ---
 4 files changed, 163 insertions(+), 110 deletions(-)

diff --git a/src/components/NcAppSidebar/NcAppSidebar.vue b/src/components/NcAppSidebar/NcAppSidebar.vue
index 7551fbdb..1bbf50c0 100644
--- a/src/components/NcAppSidebar/NcAppSidebar.vue
+++ b/src/components/NcAppSidebar/NcAppSidebar.vue
@@ -31,22 +31,33 @@ include a standard-header like it's used by the files app.
 
 ```vue
 <template>
-	<NcAppSidebar
-		title="cat-picture.jpg"
-		subtitle="last edited 3 weeks ago">
-		<NcAppSidebarTab name="Settings" id="settings-tab">
-			<template #icon>
-				<Cog :size="20" />
-			</template>
-			Settings tab content
-		</NcAppSidebarTab>
-		<NcAppSidebarTab name="Sharing" id="share-tab">
-			<template #icon>
-				<ShareVariant :size="20" />
-			</template>
-			Sharing tab content
-		</NcAppSidebarTab>
-	</NcAppSidebar>
+	<div>
+		<NcCheckboxRadioSwitch :checked.sync="hideFirstTab">
+			The first tab is hidden
+		</NcCheckboxRadioSwitch>
+		<NcAppSidebar
+			title="cat-picture.jpg"
+			subtitle="last edited 3 weeks ago">
+			<NcAppSidebarTab v-if="!hideFirstTab" name="Fist tab" id="first-tab">
+				<template #icon>
+					<Cog :size="20" />
+				</template>
+				New tab
+			</NcAppSidebarTab>
+			<NcAppSidebarTab name="Settings" id="settings-tab">
+				<template #icon>
+					<Cog :size="20" />
+				</template>
+				Settings tab content
+			</NcAppSidebarTab>
+			<NcAppSidebarTab name="Sharing" id="share-tab">
+				<template #icon>
+					<ShareVariant :size="20" />
+				</template>
+				Sharing tab content
+			</NcAppSidebarTab>
+		</NcAppSidebar>
+	</div>
 </template>
 <script>
 	import Cog from 'vue-material-design-icons/Cog'
@@ -57,10 +68,87 @@ include a standard-header like it's used by the files app.
 			Cog,
 			ShareVariant,
 		},
+		data() {
+			return {
+				hideFirstTab: true,
+			}
+		},
 	}
 </script>
 ```
 
+### One tab
+
+```vue
+<template>
+	<div>
+		<NcAppSidebar
+			title="cat-picture.jpg"
+			subtitle="last edited 3 weeks ago">
+			<NcAppSidebarTab name="Settings" id="settings-tab">
+				<template #icon>
+					<Cog :size="20" />
+				</template>
+				New tab
+			</NcAppSidebarTab>
+		</NcAppSidebar>
+	</div>
+</template>
+<script>
+import Cog from 'vue-material-design-icons/Cog'
+
+export default {
+	components: {
+		Cog,
+	},
+}
+</script>
+```
+
+### One or two tabs with condition
+
+```vue
+<template>
+	<div>
+		<NcCheckboxRadioSwitch :checked.sync="hideFirstTab">
+			The first tab is hidden
+		</NcCheckboxRadioSwitch>
+		<NcAppSidebar
+			title="cat-picture.jpg"
+			subtitle="last edited 3 weeks ago">
+			<NcAppSidebarTab v-if="!hideFirstTab" name="Settings" id="settings-tab">
+				<template #icon>
+					<Cog :size="20" />
+				</template>
+				Settings
+			</NcAppSidebarTab>
+			<NcAppSidebarTab name="Sharing" id="share-tab">
+				<template #icon>
+					<ShareVariant :size="20" />
+				</template>
+				Sharing tab content
+			</NcAppSidebarTab>
+		</NcAppSidebar>
+	</div>
+</template>
+<script>
+import Cog from 'vue-material-design-icons/Cog'
+import ShareVariant from 'vue-material-design-icons/ShareVariant'
+
+export default {
+	components: {
+		Cog,
+		ShareVariant,
+	},
+	data() {
+		return {
+			hideFirstTab: true,
+		}
+	},
+}
+</script>
+```
+
 ### Editable title
 
 ```vue
diff --git a/src/components/NcAppSidebar/NcAppSidebarTabs.vue b/src/components/NcAppSidebar/NcAppSidebarTabs.vue
index deec2b0a..e94762ec 100644
--- a/src/components/NcAppSidebar/NcAppSidebarTabs.vue
+++ b/src/components/NcAppSidebar/NcAppSidebarTabs.vue
@@ -47,8 +47,7 @@
 						role="tab"
 						@click.prevent="setActive(tab.id)">
 						<span class="app-sidebar-tabs__tab-icon">
-							<NcVNodes v-if="hasMdIcon(tab)" :vnodes="tab.$slots.icon[0]" />
-							<span v-else :class="tab.icon" />
+							<NcVNodes :vnodes="tab.renderIcon()" />
 						</span>
 						{{ tab.name }}
 					</a>
@@ -67,16 +66,6 @@
 <script>
 import NcVNodes from '../NcVNodes/index.js'
 
-import Vue from 'vue'
-
-const IsValidString = function(value) {
-	return value && typeof value === 'string' && value.trim() !== ''
-}
-
-const IsValidStringWithoutSpaces = function(value) {
-	return IsValidString(value) && value.indexOf(' ') === -1
-}
-
 export default {
 	name: 'NcAppSidebarTabs',
 
@@ -85,6 +74,15 @@ export default {
 		NcVNodes,
 	},
 
+	provide() {
+		return {
+			registerTab: this.registerTab,
+			unregisterTab: this.unregisterTab,
+			// Getter as an alternative to Vue 2.7 computed(() => this.activeTab)
+			getActiveTab: () => this.activeTab,
+		}
+	},
+
 	props: {
 		/**
 		 * Id of the tab to activate
@@ -107,10 +105,6 @@ export default {
 			 * The id of the currently active tab.
 			 */
 			activeTab: '',
-			/**
-			 * Dummy array to react on slot changes.
-			 */
-			children: [],
 		}
 	},
 
@@ -130,18 +124,6 @@ export default {
 				this.updateActive()
 			}
 		},
-
-		children() {
-			this.updateTabs()
-		},
-	},
-
-	mounted() {
-		// Init the tabs list
-		this.updateTabs()
-
-		// Let's make the children list reactive
-		this.children = this.$children
 	},
 
 	methods: {
@@ -216,62 +198,42 @@ export default {
 		 */
 		updateActive() {
 			this.activeTab = this.active
-				&& this.tabs.findIndex(tab => tab.id === this.active) !== -1
+			&& this.tabs.some(tab => tab.id === this.active)
 				? this.active
 				: this.tabs.length > 0
 					? this.tabs[0].id
 					: ''
 		},
 
-		hasMdIcon(tab) {
-			return tab?.$slots?.icon
+		/**
+		 * Register child tab in the tabs
+		 *
+		 * @param {object} tab - tab props (only the "id" is used actually)
+		 */
+		registerTab(tab) {
+			this.tabs.push(tab)
+			this.tabs.sort((a, b) => {
+				if (a.order === b.order) {
+					return OC.Util.naturalSortCompare(a.name, b.name)
+				}
+				return a.order - b.order
+			})
+			if (!this.activeTab) {
+				this.updateActive()
+			}
 		},
 
 		/**
-		 * Manually update the sidebar tabs according to $slots.default
+		 * Unregister child tab in the tabs
+		 *
+		 * @param {string} id - tab's id
 		 */
-		updateTabs() {
-			if (!this.$slots.default) {
-				this.tabs = []
-				return
+		unregisterTab(id) {
+			const tabIndex = this.tabs.findIndex((tab) => tab.id === id)
+			if (tabIndex !== -1) {
+				this.tabs.splice(tabIndex, 1)
 			}
-
-			// Find all valid children (AppSidebarTab, other components, text nodes, etc.)
-			const children = this.$slots.default.filter(elem => elem.tag || elem.text.trim())
-
-			// Find all valid instances of AppSidebarTab
-			const invalidTabs = []
-			const tabs = children.reduce((tabs, tabNode) => {
-				const tab = tabNode.componentInstance
-				// Make sure all required props are provided and valid
-				if (IsValidString(tab?.name)
-					&& IsValidStringWithoutSpaces(tab?.id)
-					&& (IsValidStringWithoutSpaces(tab?.icon) || tab?.$slots?.icon)) {
-					tabs.push(tab)
-				} else {
-					invalidTabs.push(tabNode)
-				}
-				return tabs
-			}, [])
-
-			// Tabs are optional, but you can use either tabs or non-tab-content only
-			if (tabs.length !== 0 && tabs.length !== children.length) {
-				Vue.util.warn('Mixing tabs and non-tab-content is not possible.')
-				invalidTabs.map(invalid => console.debug('Ignoring invalid tab', invalid))
-			}
-
-			// We sort the tabs by their order or by their name
-			this.tabs = tabs.sort((a, b) => {
-				const orderA = a.order || 0
-				const orderB = b.order || 0
-				if (orderA === orderB) {
-					return OC.Util.naturalSortCompare(a.name, b.name)
-				}
-				return orderA - orderB
-			})
-
-			// Init active tab if exists
-			if (this.tabs.length > 0) {
+			if (this.activeTab === id) {
 				this.updateActive()
 			}
 		},
diff --git a/src/components/NcAppSidebarTab/NcAppSidebarTab.vue b/src/components/NcAppSidebarTab/NcAppSidebarTab.vue
index d120b17f..ae9f9100 100644
--- a/src/components/NcAppSidebarTab/NcAppSidebarTab.vue
+++ b/src/components/NcAppSidebarTab/NcAppSidebarTab.vue
@@ -40,9 +40,13 @@
 </template>
 
 <script>
+import { h } from 'vue'
+
 export default {
 	name: 'NcAppSidebarTab',
 
+	inject: ['registerTab', 'unregisterTab', 'getActiveTab'],
+
 	props: {
 		id: {
 			type: String,
@@ -67,13 +71,22 @@ export default {
 		'scroll',
 	],
 
+	expose: ['id', 'name', 'icon', 'order', 'renderIcon'],
+
 	computed: {
-		// TODO: implement a better way to force pass a prop fromm Sidebar
 		isActive() {
-			return this.$parent.activeTab === this.id
+			return this.getActiveTab() === this.id
 		},
 	},
 
+	created() {
+		this.registerTab(this)
+	},
+
+	beforeDestroy() {
+		this.unregisterTab(this.id)
+	},
+
 	methods: {
 		onScroll(event) {
 			// Are we scrolled to the very bottom ?
@@ -85,6 +98,15 @@ export default {
 			}
 			this.$emit('scroll', event)
 		},
+
+		/**
+		 * Render tab's icon from slot or icon prop
+		 *
+		 * @return {import('vue').VNode|import('vue').VNode[]}
+		 */
+		renderIcon() {
+			return this.$slots.icon || this.$scopedSlots.icon?.() || h('span', { staticClass: this.icon })
+		},
 	},
 }
 </script>
diff --git a/tests/unit/components/NcAppSidebar/NcAppSidebarTabs.spec.js b/tests/unit/components/NcAppSidebar/NcAppSidebarTabs.spec.js
index 201de12e..2f20724c 100644
--- a/tests/unit/components/NcAppSidebar/NcAppSidebarTabs.spec.js
+++ b/tests/unit/components/NcAppSidebar/NcAppSidebarTabs.spec.js
@@ -189,23 +189,4 @@ describe('NcAppSidebarTabs.vue', () => {
 			})
 		})
 	})
-	describe('when tabs and other elements are mixed', () => {
-		it('Issues a warning and logs to console .', () => {
-			mount(NcAppSidebarTabs, {
-				slots: {
-					default: [
-						'<nc-app-sidebar-tab id="1" icon="icon-details" name="Tab1">Tab1</nc-app-sidebar-tab>',
-						'<NcAppSidebarTab id="2" icon="icon-details" name="Tab2">Tab2</NcAppSidebarTab>',
-						'<div>Non-tab-content</div>',
-						'Test',
-					],
-				},
-				stubs: {
-					NcAppSidebarTab,
-				},
-			})
-			expect(onWarning).toHaveBeenCalledTimes(1)
-			expect(consoleDebug).toHaveBeenCalledTimes(2)
-		})
-	})
 })

From f9bc5078c9bf5c02d11b98a5838bf2993aca9aca Mon Sep 17 00:00:00 2001
From: Grigorii Shartsev <grigorii.shartsev@nextcloud.com>
Date: Tue, 28 Mar 2023 03:37:56 +0200
Subject: [PATCH 11/17] fix(NcAppSIdebarTabs): fix a11y, focusable navigation,
 Home End hotkeys

Signed-off-by: Grigorii Shartsev <grigorii.shartsev@nextcloud.com>
---
 src/components/NcAppSidebar/NcAppSidebarTabs.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/NcAppSidebar/NcAppSidebarTabs.vue b/src/components/NcAppSidebar/NcAppSidebarTabs.vue
index e94762ec..f251322e 100644
--- a/src/components/NcAppSidebar/NcAppSidebarTabs.vue
+++ b/src/components/NcAppSidebar/NcAppSidebarTabs.vue
@@ -33,6 +33,8 @@
 			@keydown.left.exact.prevent="focusPreviousTab"
 			@keydown.right.exact.prevent="focusNextTab"
 			@keydown.tab.exact.prevent="focusActiveTabContent"
+			@keydown.home.exact.prevent="focusFirstTab"
+			@keydown.end.exact.prevent="focusLastTab"
 			@keydown.33.exact.prevent="focusFirstTab"
 			@keydown.34.exact.prevent="focusLastTab">
 			<ul>
@@ -43,7 +45,7 @@
 						:class="{ active: activeTab === tab.id }"
 						:data-id="tab.id"
 						:href="`#tab-${tab.id}`"
-						:tabindex="activeTab === tab.id ? undefined : -1"
+						:tabindex="activeTab === tab.id ? 0 : -1"
 						role="tab"
 						@click.prevent="setActive(tab.id)">
 						<span class="app-sidebar-tabs__tab-icon">

From f1acfcc465eb427dae4a83d29babf45887435f6a Mon Sep 17 00:00:00 2001
From: Grigorii Shartsev <grigorii.shartsev@nextcloud.com>
Date: Tue, 28 Mar 2023 03:38:52 +0200
Subject: [PATCH 12/17] docs(NcAppSIdebarTabs): add JSDocs and examples

Signed-off-by: Grigorii Shartsev <grigorii.shartsev@nextcloud.com>
---
 src/components/NcAppSidebar/NcAppSidebar.vue  | 173 ++++++++++++++----
 .../NcAppSidebar/NcAppSidebarTabs.vue         |  31 ++--
 .../NcAppSidebarTab/NcAppSidebarTab.vue       |  26 +++
 3 files changed, 180 insertions(+), 50 deletions(-)

diff --git a/src/components/NcAppSidebar/NcAppSidebar.vue b/src/components/NcAppSidebar/NcAppSidebar.vue
index 1bbf50c0..f4c4117f 100644
--- a/src/components/NcAppSidebar/NcAppSidebar.vue
+++ b/src/components/NcAppSidebar/NcAppSidebar.vue
@@ -31,54 +31,48 @@ include a standard-header like it's used by the files app.
 
 ```vue
 <template>
-	<div>
-		<NcCheckboxRadioSwitch :checked.sync="hideFirstTab">
-			The first tab is hidden
-		</NcCheckboxRadioSwitch>
-		<NcAppSidebar
-			title="cat-picture.jpg"
-			subtitle="last edited 3 weeks ago">
-			<NcAppSidebarTab v-if="!hideFirstTab" name="Fist tab" id="first-tab">
-				<template #icon>
-					<Cog :size="20" />
-				</template>
-				New tab
-			</NcAppSidebarTab>
-			<NcAppSidebarTab name="Settings" id="settings-tab">
-				<template #icon>
-					<Cog :size="20" />
-				</template>
-				Settings tab content
-			</NcAppSidebarTab>
-			<NcAppSidebarTab name="Sharing" id="share-tab">
-				<template #icon>
-					<ShareVariant :size="20" />
-				</template>
-				Sharing tab content
-			</NcAppSidebarTab>
-		</NcAppSidebar>
-	</div>
+	<NcAppSidebar
+		title="cat-picture.jpg"
+		subtitle="last edited 3 weeks ago">
+		<NcAppSidebarTab name="Search" id="search-tab">
+			<template #icon>
+				<Magnify :size="20" />
+			</template>
+			Search tab content
+		</NcAppSidebarTab>
+		<NcAppSidebarTab name="Settings" id="settings-tab">
+			<template #icon>
+				<Cog :size="20" />
+			</template>
+			Settings tab content
+		</NcAppSidebarTab>
+		<NcAppSidebarTab name="Sharing" id="share-tab">
+			<template #icon>
+				<ShareVariant :size="20" />
+			</template>
+			Sharing tab content
+		</NcAppSidebarTab>
+	</NcAppSidebar>
 </template>
 <script>
+	import Magnify from 'vue-material-design-icons/Magnify'
 	import Cog from 'vue-material-design-icons/Cog'
 	import ShareVariant from 'vue-material-design-icons/ShareVariant'
 
 	export default {
 		components: {
+			Magnify,
 			Cog,
 			ShareVariant,
 		},
-		data() {
-			return {
-				hideFirstTab: true,
-			}
-		},
 	}
 </script>
 ```
 
 ### One tab
 
+Single tab is rendered without navigation.
+
 ```vue
 <template>
 	<div>
@@ -89,7 +83,7 @@ include a standard-header like it's used by the files app.
 				<template #icon>
 					<Cog :size="20" />
 				</template>
-				New tab
+				Single tab content
 			</NcAppSidebarTab>
 		</NcAppSidebar>
 	</div>
@@ -105,18 +99,117 @@ export default {
 </script>
 ```
 
-### One or two tabs with condition
+### Dynamic tabs
 
 ```vue
 <template>
 	<div>
-		<NcCheckboxRadioSwitch :checked.sync="hideFirstTab">
-			The first tab is hidden
-		</NcCheckboxRadioSwitch>
+		<NcCheckboxRadioSwitch :checked.sync="showTabs[0]">Show search tab</NcCheckboxRadioSwitch>
+		<NcCheckboxRadioSwitch :checked.sync="showTabs[1]">Show settings tab</NcCheckboxRadioSwitch>
+		<NcCheckboxRadioSwitch :checked.sync="showTabs[2]">Show sharing tab</NcCheckboxRadioSwitch>
 		<NcAppSidebar
 			title="cat-picture.jpg"
 			subtitle="last edited 3 weeks ago">
-			<NcAppSidebarTab v-if="!hideFirstTab" name="Settings" id="settings-tab">
+			<NcAppSidebarTab v-if="showTabs[0]" name="Search" id="search-tab">
+				<template #icon>
+					<Magnify :size="20" />
+				</template>
+				Search tab content
+			</NcAppSidebarTab>
+			<NcAppSidebarTab v-if="showTabs[1]" name="Settings" id="settings-tab">
+				<template #icon>
+					<Cog :size="20" />
+				</template>
+				Settings
+			</NcAppSidebarTab>
+			<NcAppSidebarTab v-if="showTabs[2]" name="Sharing" id="share-tab">
+				<template #icon>
+					<ShareVariant :size="20" />
+				</template>
+				Sharing tab content
+			</NcAppSidebarTab>
+		</NcAppSidebar>
+	</div>
+</template>
+<script>
+import Magnify from 'vue-material-design-icons/Magnify'
+import Cog from 'vue-material-design-icons/Cog'
+import ShareVariant from 'vue-material-design-icons/ShareVariant'
+
+export default {
+	components: {
+		Magnify,
+		Cog,
+		ShareVariant,
+	},
+	data() {
+		return {
+			showTabs: [true, true, false],
+		}
+	},
+}
+</script>
+```
+
+### Custom order
+
+```vue
+<template>
+	<NcAppSidebar
+		title="cat-picture.jpg"
+		subtitle="last edited 3 weeks ago">
+		<NcAppSidebarTab name="Search" id="search-tab" order="3">
+			<template #icon>
+				<Magnify :size="20" />
+			</template>
+			Search tab content
+		</NcAppSidebarTab>
+		<NcAppSidebarTab name="Settings" id="settings-tab" order="2">
+			<template #icon>
+				<Cog :size="20" />
+			</template>
+			Settings tab content
+		</NcAppSidebarTab>
+		<NcAppSidebarTab name="Sharing" id="share-tab" order="1">
+			<template #icon>
+				<ShareVariant :size="20" />
+			</template>
+			Sharing tab content
+		</NcAppSidebarTab>
+	</NcAppSidebar>
+</template>
+<script>
+import Magnify from 'vue-material-design-icons/Magnify'
+import Cog from 'vue-material-design-icons/Cog'
+import ShareVariant from 'vue-material-design-icons/ShareVariant'
+
+export default {
+	components: {
+		Magnify,
+		Cog,
+		ShareVariant,
+	},
+}
+</script>
+```
+
+### Activating tab programmatically
+
+```vue
+<template>
+	<div>
+		<NcMultiselect v-model="active" :options="['search-tab', 'settings-tab', 'share-tab']" />
+		<NcAppSidebar
+			title="cat-picture.jpg"
+			subtitle="last edited 3 weeks ago"
+			:active.sync="active">
+			<NcAppSidebarTab name="Search" id="search-tab">
+				<template #icon>
+					<Magnify :size="20" />
+				</template>
+				Search tab content
+			</NcAppSidebarTab>
+			<NcAppSidebarTab name="Settings" id="settings-tab">
 				<template #icon>
 					<Cog :size="20" />
 				</template>
@@ -132,17 +225,19 @@ export default {
 	</div>
 </template>
 <script>
+import Magnify from 'vue-material-design-icons/Magnify'
 import Cog from 'vue-material-design-icons/Cog'
 import ShareVariant from 'vue-material-design-icons/ShareVariant'
 
 export default {
 	components: {
+		Magnify,
 		Cog,
 		ShareVariant,
 	},
 	data() {
 		return {
-			hideFirstTab: true,
+			active: 'search-tab',
 		}
 	},
 }
diff --git a/src/components/NcAppSidebar/NcAppSidebarTabs.vue b/src/components/NcAppSidebar/NcAppSidebarTabs.vue
index f251322e..b3f32fb8 100644
--- a/src/components/NcAppSidebar/NcAppSidebarTabs.vue
+++ b/src/components/NcAppSidebar/NcAppSidebarTabs.vue
@@ -60,6 +60,7 @@
 		<!-- tabs content -->
 		<div :class="{'app-sidebar-tabs__content--multiple': hasMultipleTabs}"
 			class="app-sidebar-tabs__content">
+			<!-- @slot Tabs content - NcAppSidebarTab components or any content if there is no tabs -->
 			<slot />
 		</div>
 	</div>
@@ -72,7 +73,6 @@ export default {
 	name: 'NcAppSidebarTabs',
 
 	components: {
-		// Component to render the material design icon (vnodes)
 		NcVNodes,
 	},
 
@@ -100,22 +100,28 @@ export default {
 	data() {
 		return {
 			/**
-			 * The tab component instances to build the tab navbar from.
+			 * Tab descriptions from the passed NcSidebarTab components' props to build the tab navbar from.
 			 */
 			tabs: [],
 			/**
-			 * The id of the currently active tab.
+			 * Local active (open) tab's ID. It allows to use component without active.sync
 			 */
 			activeTab: '',
 		}
 	},
 
 	computed: {
+		/**
+		 * Has multiple tabs. If only one tab - its content is shown without navigation
+		 *
+		 * @return {boolean}
+		 */
 		hasMultipleTabs() {
 			return this.tabs.length > 1
 		},
+
 		currentTabIndex() {
-			return this.tabs.findIndex(tab => tab.id === this.activeTab)
+			return this.tabs.findIndex((tab) => tab.id === this.activeTab)
 		},
 	},
 
@@ -137,6 +143,9 @@ export default {
 		 */
 		setActive(id) {
 			this.activeTab = id
+			/**
+			 * @property {string} active - active tab's id
+			 */
 			this.$emit('update:active', this.activeTab)
 		},
 
@@ -148,7 +157,7 @@ export default {
 			if (this.currentTabIndex > 0) {
 				this.setActive(this.tabs[this.currentTabIndex - 1].id)
 			}
-			this.focusActiveTab() // focus nav item
+			this.focusActiveTab()
 		},
 
 		/**
@@ -159,7 +168,7 @@ export default {
 			if (this.currentTabIndex < this.tabs.length - 1) {
 				this.setActive(this.tabs[this.currentTabIndex + 1].id)
 			}
-			this.focusActiveTab() // focus nav item
+			this.focusActiveTab()
 		},
 
 		/**
@@ -168,7 +177,7 @@ export default {
 		 */
 		focusFirstTab() {
 			this.setActive(this.tabs[0].id)
-			this.focusActiveTab() // focus nav item
+			this.focusActiveTab()
 		},
 
 		/**
@@ -177,7 +186,7 @@ export default {
 		 */
 		focusLastTab() {
 			this.setActive(this.tabs[this.tabs.length - 1].id)
-			this.focusActiveTab() // focus nav item
+			this.focusActiveTab()
 		},
 
 		/**
@@ -210,7 +219,7 @@ export default {
 		/**
 		 * Register child tab in the tabs
 		 *
-		 * @param {object} tab - tab props (only the "id" is used actually)
+		 * @param {object} tab child tab passed to slot
 		 */
 		registerTab(tab) {
 			this.tabs.push(tab)
@@ -226,9 +235,9 @@ export default {
 		},
 
 		/**
-		 * Unregister child tab in the tabs
+		 * Unregister child tab from the tabs
 		 *
-		 * @param {string} id - tab's id
+		 * @param {string} id tab's id
 		 */
 		unregisterTab(id) {
 			const tabIndex = this.tabs.findIndex((tab) => tab.id === id)
diff --git a/src/components/NcAppSidebarTab/NcAppSidebarTab.vue b/src/components/NcAppSidebarTab/NcAppSidebarTab.vue
index ae9f9100..72bfa0ac 100644
--- a/src/components/NcAppSidebarTab/NcAppSidebarTab.vue
+++ b/src/components/NcAppSidebarTab/NcAppSidebarTab.vue
@@ -35,6 +35,7 @@
 		<h3 class="hidden-visually">
 			{{ name }}
 		</h3>
+		<!-- @slot Tab panel content -->
 		<slot />
 	</section>
 </template>
@@ -52,14 +53,26 @@ export default {
 			type: String,
 			required: true,
 		},
+
+		/**
+		 * Tab title in navigation
+		 */
 		name: {
 			type: String,
 			required: true,
 		},
+
+		/**
+		 * Tab icon's html class in navigation. Used if #icon slot is not provided
+		 */
 		icon: {
 			type: String,
 			default: '',
 		},
+
+		/**
+		 * Tab order in navigation. If not provided, name is used.
+		 */
 		order: {
 			type: Number,
 			default: 0,
@@ -74,16 +87,24 @@ export default {
 	expose: ['id', 'name', 'icon', 'order', 'renderIcon'],
 
 	computed: {
+		/**
+		 * Is the current tab an active tab, that should be shown?
+		 *
+		 * @return {boolean}
+		 */
 		isActive() {
 			return this.getActiveTab() === this.id
 		},
 	},
 
 	created() {
+		// As the tab is created - register it in the tabs component
+		// It's better to provide computed tab object, not component instance as it easy
 		this.registerTab(this)
 	},
 
 	beforeDestroy() {
+		// Unregister the tab from tabs
 		this.unregisterTab(this.id)
 	},
 
@@ -93,9 +114,14 @@ export default {
 			if (this.$el.scrollHeight - this.$el.scrollTop === this.$el.clientHeight) {
 				/**
 				 * Bottom scroll is reached
+				 *
+				 * @property {Event} event Native scroll event
 				 */
 				this.$emit('bottom-reached', event)
 			}
+			/**
+			 * @property {Event} event Native scroll event
+			 */
 			this.$emit('scroll', event)
 		},
 

From 02ff624ff5d8a60308fab2387dcc46c1fd07eef5 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Tue, 28 Mar 2023 15:30:26 +0200
Subject: [PATCH 13/17] chore(release): Add changelog for 7.8.5

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 CHANGELOG.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e91f24b9..0d4a4577 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 All notable changes to this project will be documented in this file.
 
+## [v7.8.5](https://github.com/nextcloud/nextcloud-vue/tree/v7.8.5) (2023-03-28)
+
+[Full Changelog](https://github.com/nextcloud/nextcloud-vue/compare/v7.8.4...v7.8.5)
+
+### :bug: Fixed bugs
+
+- fix\(NcRichContenteditable\): Completely stop event propagation for keyup events [\#3937](https://github.com/nextcloud/nextcloud-vue/pull/3937) ([nickvergessen](https://github.com/nickvergessen))
+- fix\(NcRichText\): Match IP addresses as links [\#3935](https://github.com/nextcloud/nextcloud-vue/pull/3935) ([nickvergessen](https://github.com/nickvergessen))
+- fix\(NcRichText\): Fix NcRichText style [\#3932](https://github.com/nextcloud/nextcloud-vue/pull/3932) ([julien-nc](https://github.com/julien-nc))
+
 ## [v7.8.4](https://github.com/nextcloud/nextcloud-vue/tree/v7.8.4) (2023-03-24)
 
 [Full Changelog](https://github.com/nextcloud/nextcloud-vue/compare/v7.8.3...v7.8.4)

From 227a4a3461d416fecfea9358d6d7a13fd21efb61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6?= <skjnldsv@users.noreply.github.com>
Date: Tue, 28 Mar 2023 16:54:58 +0200
Subject: [PATCH 14/17] fix(NcButton): align center for wide buttons
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Raimund Schlüßler <raimund.schluessler@mailbox.org>
Signed-off-by: John Molakvoæ <skjnldsv@users.noreply.github.com>
---
 src/components/NcButton/NcButton.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/NcButton/NcButton.vue b/src/components/NcButton/NcButton.vue
index d7072689..06847fba 100644
--- a/src/components/NcButton/NcButton.vue
+++ b/src/components/NcButton/NcButton.vue
@@ -429,7 +429,7 @@ export default {
 	&__wrapper {
 		display: inline-flex;
 		align-items: center;
-		justify-content: space-around;
+		justify-content: center;
 		width: 100%;
 	}
 

From 25a3f60473e18a80576769d6b640b91102dbdc5a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 29 Mar 2023 06:57:13 +0000
Subject: [PATCH 15/17] chore(deps-dev): Bump eslint-plugin-cypress from 2.12.1
 to 2.13.1

Bumps [eslint-plugin-cypress](https://github.com/cypress-io/eslint-plugin-cypress) from 2.12.1 to 2.13.1.
- [Release notes](https://github.com/cypress-io/eslint-plugin-cypress/releases)
- [Commits](https://github.com/cypress-io/eslint-plugin-cypress/compare/v2.12.1...v2.13.1)

---
updated-dependencies:
- dependency-name: eslint-plugin-cypress
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e2f9fa74..7015d0f9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9664,9 +9664,9 @@
 			}
 		},
 		"node_modules/eslint-plugin-cypress": {
-			"version": "2.12.1",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-cypress/-/eslint-plugin-cypress-2.12.1.tgz",
-			"integrity": "sha512-c2W/uPADl5kospNDihgiLc7n87t5XhUbFDoTl6CfVkmG+kDAb5Ux10V9PoLPu9N+r7znpc+iQlcmAqT1A/89HA==",
+			"version": "2.13.1",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-cypress/-/eslint-plugin-cypress-2.13.1.tgz",
+			"integrity": "sha512-THjc7IT3S9H4KwmRhzAhMGQaEqy78/7W75He/gBhJEH0vIuAY16vOI4YSliDo/ZY+Wm6DtvMHR+8uVvICcI3Lw==",
 			"dev": true,
 			"dependencies": {
 				"globals": "^11.12.0"
@@ -34682,9 +34682,9 @@
 			}
 		},
 		"eslint-plugin-cypress": {
-			"version": "2.12.1",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-cypress/-/eslint-plugin-cypress-2.12.1.tgz",
-			"integrity": "sha512-c2W/uPADl5kospNDihgiLc7n87t5XhUbFDoTl6CfVkmG+kDAb5Ux10V9PoLPu9N+r7znpc+iQlcmAqT1A/89HA==",
+			"version": "2.13.1",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-cypress/-/eslint-plugin-cypress-2.13.1.tgz",
+			"integrity": "sha512-THjc7IT3S9H4KwmRhzAhMGQaEqy78/7W75He/gBhJEH0vIuAY16vOI4YSliDo/ZY+Wm6DtvMHR+8uVvICcI3Lw==",
 			"dev": true,
 			"requires": {
 				"globals": "^11.12.0"

From 1828cb439fe51d129f92f0e3c4966246f1f76d85 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 29 Mar 2023 07:02:06 +0000
Subject: [PATCH 16/17] chore(deps-dev): Bump cypress from 12.8.1 to 12.9.0

Bumps [cypress](https://github.com/cypress-io/cypress) from 12.8.1 to 12.9.0.
- [Release notes](https://github.com/cypress-io/cypress/releases)
- [Changelog](https://github.com/cypress-io/cypress/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/cypress-io/cypress/compare/v12.8.1...v12.9.0)

---
updated-dependencies:
- dependency-name: cypress
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7015d0f9..1f8824c2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8135,9 +8135,9 @@
 			"dev": true
 		},
 		"node_modules/cypress": {
-			"version": "12.8.1",
-			"resolved": "https://registry.npmjs.org/cypress/-/cypress-12.8.1.tgz",
-			"integrity": "sha512-lIFbKdaSYAOarNLHNFa2aPZu6YSF+8UY4VRXMxJrFUnk6RvfG0AWsZ7/qle/aIz30TNUD4aOihz2ZgS4vuQVSA==",
+			"version": "12.9.0",
+			"resolved": "https://registry.npmjs.org/cypress/-/cypress-12.9.0.tgz",
+			"integrity": "sha512-Ofe09LbHKgSqX89Iy1xen2WvpgbvNxDzsWx3mgU1mfILouELeXYGwIib3ItCwoRrRifoQwcBFmY54Vs0zw7QCg==",
 			"dev": true,
 			"hasInstallScript": true,
 			"dependencies": {
@@ -33316,9 +33316,9 @@
 			"dev": true
 		},
 		"cypress": {
-			"version": "12.8.1",
-			"resolved": "https://registry.npmjs.org/cypress/-/cypress-12.8.1.tgz",
-			"integrity": "sha512-lIFbKdaSYAOarNLHNFa2aPZu6YSF+8UY4VRXMxJrFUnk6RvfG0AWsZ7/qle/aIz30TNUD4aOihz2ZgS4vuQVSA==",
+			"version": "12.9.0",
+			"resolved": "https://registry.npmjs.org/cypress/-/cypress-12.9.0.tgz",
+			"integrity": "sha512-Ofe09LbHKgSqX89Iy1xen2WvpgbvNxDzsWx3mgU1mfILouELeXYGwIib3ItCwoRrRifoQwcBFmY54Vs0zw7QCg==",
 			"dev": true,
 			"requires": {
 				"@cypress/request": "^2.88.10",

From 3d73df2edf74b588d6d65ccc83ca597c8581193b Mon Sep 17 00:00:00 2001
From: "julia.kirschenheuter" <julia.kirschenheuter@nextcloud.com>
Date: Tue, 21 Mar 2023 14:58:22 +0100
Subject: [PATCH 17/17] Add `aria-hidden` to icons of different components

Signed-off-by: julia.kirschenheuter <julia.kirschenheuter@nextcloud.com>
---
 .../NcActionButton/NcActionButton.vue          |  8 ++++++++
 src/components/NcActionInput/NcActionInput.vue |  8 ++++++++
 src/components/NcActionLink/NcActionLink.vue   |  8 ++++++++
 src/components/NcActionText/NcActionText.vue   |  1 +
 src/components/NcActions/NcActions.vue         | 10 ++++++++++
 src/components/NcButton/NcButton.vue           | 18 +++++++++++++++++-
 src/mixins/actionText.js                       |  7 +++++++
 7 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/src/components/NcActionButton/NcActionButton.vue b/src/components/NcActionButton/NcActionButton.vue
index d791070b..2a2866be 100644
--- a/src/components/NcActionButton/NcActionButton.vue
+++ b/src/components/NcActionButton/NcActionButton.vue
@@ -190,6 +190,7 @@ export default {
 			<slot name="icon">
 				<span :class="[isIconUrl ? 'action-button__icon--url' : icon]"
 					:style="{ backgroundImage: isIconUrl ? `url(${icon})` : null }"
+					:aria-hidden="ariaHidden"
 					class="action-button__icon" />
 			</slot>
 
@@ -239,6 +240,13 @@ export default {
 			type: Boolean,
 			default: false,
 		},
+		/**
+		 * aria-hidden attribute for the icon slot
+		 */
+		ariaHidden: {
+			type: Boolean,
+			default: null,
+		},
 	},
 	computed: {
 		/**
diff --git a/src/components/NcActionInput/NcActionInput.vue b/src/components/NcActionInput/NcActionInput.vue
index f549604a..41444990 100644
--- a/src/components/NcActionInput/NcActionInput.vue
+++ b/src/components/NcActionInput/NcActionInput.vue
@@ -132,6 +132,7 @@ For the multiselect component, all events will be passed through. Please see the
 				<slot name="icon">
 					<span :class="[isIconUrl ? 'action-input__icon--url' : icon]"
 						:style="{ backgroundImage: isIconUrl ? `url(${icon})` : null }"
+						:aria-hidden="ariaHidden"
 						class="action-input__icon" />
 				</slot>
 			</span>
@@ -341,6 +342,13 @@ export default {
 			type: String,
 			default: '',
 		},
+		/**
+		 * aria-hidden attribute for the icon slot
+		 */
+		ariaHidden: {
+			type: Boolean,
+			default: null,
+		},
 	},
 
 	emits: [
diff --git a/src/components/NcActionLink/NcActionLink.vue b/src/components/NcActionLink/NcActionLink.vue
index 96579e43..2de2c097 100644
--- a/src/components/NcActionLink/NcActionLink.vue
+++ b/src/components/NcActionLink/NcActionLink.vue
@@ -62,6 +62,7 @@ export default {
 			<slot name="icon">
 				<span :class="[isIconUrl ? 'action-link__icon--url' : icon]"
 					:style="{ backgroundImage: isIconUrl ? `url(${icon})` : null }"
+					:aria-hidden="ariaHidden"
 					class="action-link__icon" />
 			</slot>
 
@@ -141,6 +142,13 @@ export default {
 			type: String,
 			default: null,
 		},
+		/**
+		 * aria-hidden attribute for the icon slot
+		 */
+		ariaHidden: {
+			type: Boolean,
+			default: null,
+		},
 	},
 }
 </script>
diff --git a/src/components/NcActionText/NcActionText.vue b/src/components/NcActionText/NcActionText.vue
index 3cb98c79..ecf8d408 100644
--- a/src/components/NcActionText/NcActionText.vue
+++ b/src/components/NcActionText/NcActionText.vue
@@ -29,6 +29,7 @@
 			<slot name="icon">
 				<span v-if="icon !== ''"
 					:class="[isIconUrl ? 'action-text__icon--url' : icon]"
+					:aria-hidden="ariaHidden"
 					:style="{ backgroundImage: isIconUrl ? `url(${icon})` : null }"
 					class="action-text__icon" />
 			</slot>
diff --git a/src/components/NcActions/NcActions.vue b/src/components/NcActions/NcActions.vue
index d24a7c8c..cf028272 100644
--- a/src/components/NcActions/NcActions.vue
+++ b/src/components/NcActions/NcActions.vue
@@ -619,6 +619,14 @@ export default {
 			default: t('Actions'),
 		},
 
+		/**
+		 * aria-hidden attribute for the icon slot
+		 */
+		ariaHidden: {
+			type: Boolean,
+			default: null,
+		},
+
 		/**
 		 * Wanted direction of the menu
 		 */
@@ -946,6 +954,7 @@ export default {
 						// If it has a title, we use a secondary button
 						type: this.type || (title ? 'secondary' : 'tertiary'),
 						disabled: this.disabled || action?.componentOptions?.propsData?.disabled,
+						ariaHidden: this.ariaHidden,
 						...action?.componentOptions?.propsData,
 					},
 					directives: [{
@@ -1030,6 +1039,7 @@ export default {
 						props: {
 							type: this.triggerBtnType,
 							disabled: this.disabled,
+							ariaHidden: this.ariaHidden,
 						},
 						slot: 'trigger',
 						ref: 'menuButton',
diff --git a/src/components/NcButton/NcButton.vue b/src/components/NcButton/NcButton.vue
index 20198d6c..d269f82a 100644
--- a/src/components/NcButton/NcButton.vue
+++ b/src/components/NcButton/NcButton.vue
@@ -287,6 +287,13 @@ export default {
 			type: Boolean,
 			default: false,
 		},
+		/**
+		 * aria-hidden attribute for the icon slot
+		 */
+		ariaHidden: {
+			type: Boolean,
+			default: null,
+		},
 	},
 
 	/**
@@ -345,7 +352,16 @@ export default {
 			},
 			[
 				h('span', { class: 'button-vue__wrapper' }, [
-					hasIcon ? h('span', { class: 'button-vue__icon' }, [this.$slots.icon]) : null,
+					hasIcon
+						? h('span', {
+							class: 'button-vue__icon',
+							attrs: {
+								'aria-hidden': this.ariaHidden,
+							},
+						},
+						[this.$slots.icon],
+						)
+						: null,
 					hasText ? h('span', { class: 'button-vue__text' }, [text]) : null,
 				]),
 			]
diff --git a/src/mixins/actionText.js b/src/mixins/actionText.js
index 6c699926..22cad6bd 100644
--- a/src/mixins/actionText.js
+++ b/src/mixins/actionText.js
@@ -54,6 +54,13 @@ export default {
 			type: String,
 			default: '',
 		},
+		/**
+		 * aria-hidden attribute for the icon slot
+		 */
+		ariaHidden: {
+			type: Boolean,
+			default: null,
+		},
 	},
 
 	emits: [