Merge pull request #1003 from nextcloud/fix/screensharing-performance

fix(screensharing): picker performance and UI improvements

.eslintrc.js

@@ -52,8 +52,10 @@ module.exports = {
 		// It works fine on server because by default in @nextcloud/eslint-config .vue files are not inspected via eslint-plugin-import thus import/extensions doesn't include .vue
 		// See: https://github.com/import-js/eslint-plugin-import/blob/main/README.md#importextensions
 		'import/default': 'off',
-		// import/namespace is not compatible with TS/JS mix
+		// Not compatible with TS/JS mix
 		'import/namespace': 'off',
+		// Not compatible with TS/JS mix or reexports
+		'import/named': 'off',
 		/**
 		 * ESLint
 		 */
@@ -135,7 +137,7 @@ module.exports = {
 
 	overrides: [
 		{
-			files: '*.ts',
+			files: ['*.ts', '*.vue'],
 			rules: {
 				'jsdoc/require-returns-type': 'off', // TODO upstream
 			},

src/global.d.ts

@@ -16,6 +16,11 @@ declare module '*.svg' {
 	export default url
 }
 
+declare module '*.svg?raw' {
+	const url: string
+	export default url
+}
+
 declare module 'vue-material-design-icons/*.vue' {
 	import type { Component } from 'vue'
 	const component: Component<Record<string, never>, Record<string, never>, Record<string, never>, { size: number }, Record<string, never>>

src/help/renderer/ButtonCopy.vue

@@ -19,9 +19,9 @@ import { t } from '@nextcloud/l10n'
 
 const props = withDefaults(
 	defineProps<{
-  text?: string,
-  content?: string,
-  getContent?: () => string,
+	text?: string,
+	content?: string,
+	getContent?: () => string,
 }>(), {
 		text: t('talk_desktop', 'Copy'),
 		content: undefined,

src/main.js

@@ -13,7 +13,7 @@ const { createAuthenticationWindow } = require('./authentication/authentication.
 const { openLoginWebView } = require('./authentication/login.window.js')
 const { createHelpWindow } = require('./help/help.window.js')
 const { createUpgradeWindow } = require('./upgrade/upgrade.window.js')
-const { systemInfo, isLinux, isMac, isWayland, isWindows } = require('./app/system.utils.ts')
+const { systemInfo, isLinux, isMac, isWindows } = require('./app/system.utils.ts')
 const { createTalkWindow } = require('./talk/talk.window.js')
 const { createWelcomeWindow } = require('./welcome/welcome.window.js')
 const { installVueDevtools } = require('./install-vue-devtools.js')
@@ -94,8 +94,7 @@ ipcMain.handle('app:getDesktopCapturerSources', async () => {
 		return null
 	}
 
-	// We cannot show live previews on Wayland, so we show thumbnails
-	const thumbnailWidth = isWayland ? 320 : 0
+	const thumbnailWidth = 800
 
 	const sources = await desktopCapturer.getSources({
 		types: ['screen', 'window'],

src/shared/globals/globals.js

@@ -9,7 +9,7 @@ import { translate, translatePlural } from '@nextcloud/l10n'
 import { appData } from '../../app/AppData.js'
 import { dialogs } from './OC/dialogs.js'
 import { MimeTypeList } from './OC/mimetype.js'
-import { getDesktopMediaSource } from '../../talk/renderer/getDesktopMediaSource.js'
+import { getDesktopMediaSource } from '../../talk/renderer/screensharing/screensharing.module.ts'
 
 let enabledAbsoluteWebroot = false