wip

Author: Julusian

packages/webui/.eslintignore

@@ -0,0 +1,49 @@
+import { generateEslintConfig } from '@sofie-automation/code-standard-preset/eslint/main.mjs'
+// import pluginYaml from 'eslint-plugin-yml'
+import pluginReact from 'eslint-plugin-react'
+import globals from 'globals'
+
+const extendedRules = await generateEslintConfig({
+	tsconfigName: 'tsconfig.eslint.json',
+	ignores: [
+		'public',
+		'dist',
+		'src/fonts',
+		'src/meteor',
+		// HACk
+		// 'src/client/lib/data/mos/plugin-support.ts',
+	],
+	disableNodeRules:
+})
+extendedRules.push(
+	{
+		settings: {
+			react: {
+				version: 'detect',
+			},
+		},
+	},
+	pluginReact.configs.flat.recommended,
+	pluginReact.configs.flat['jsx-runtime'],
+	{
+		files: ['src/**/*'],
+		languageOptions: {
+			globals: {
+				...globals.browser,
+				JSX: true,
+			},
+		},
+		rules: {},
+	},
+	// extendedRules.push(...pluginYaml.configs['flat/recommended'], {
+	// 	files: ['**/*.yaml'],
+
+	// 	rules: {
+	// 		'yml/quotes': ['error', { prefer: 'single' }],
+	// 		'yml/spaced-comment': ['error'],
+	// 		'spaced-comment': ['off'],
+	// 	},
+	// })
+)
+
+export default extendedRules

packages/webui/eslint.config.mjs

@@ -103,6 +103,7 @@
 		"@welldone-software/why-did-you-render": "^4.3.2",
 		"@xmldom/xmldom": "^0.8.10",
 		"babel-jest": "^29.7.0",
+		"globals": "^15.14.0",
 		"sass": "^1.83.4",
 		"sinon": "^14.0.2",
 		"typescript": "~5.5",

packages/webui/package.json

@@ -1,13 +1,14 @@
-import { ProtectedString } from '@sofie-automation/corelib/dist/protectedString'
+import { ProtectedString, unprotectString } from '@sofie-automation/corelib/dist/protectedString'
 import { useState, useCallback } from 'react'
 
 export function useToggleExpandHelper(): {
-	toggleExpanded(id: ProtectedString<any> | string | number, forceState?: boolean): void
-	isExpanded(id: ProtectedString<any> | string | number): boolean
+	toggleExpanded: (id: ProtectedString<any> | string | number, forceState?: boolean) => void
+	isExpanded: (id: ProtectedString<any> | string | number) => boolean
 } {
 	const [expandedItemIds, setExpandedItemIds] = useState<Record<string, boolean>>({})
 
-	const toggleExpanded = useCallback((id: string | number, forceState?: boolean) => {
+	const toggleExpanded = useCallback((id0: ProtectedString<any> | string | number, forceState?: boolean) => {
+		const id = typeof id0 !== 'number' && typeof id0 !== 'string' ? unprotectString(id0) : id0
 		setExpandedItemIds((oldExpanded) => {
 			// This will leak entries as layers are added and removed, but not fast enough to be a problem
 			return {
@@ -17,7 +18,8 @@ export function useToggleExpandHelper(): {
 		})
 	}, [])
 
-	const isExpanded = (id: string | number): boolean => {
+	const isExpanded = (id0: ProtectedString<any> | string | number): boolean => {
+		const id = typeof id0 !== 'number' && typeof id0 !== 'string' ? unprotectString(id0) : id0
 		return !!expandedItemIds[id]
 	}
 

packages/webui/src/client/ui/globals/keyboardGlobals.d.ts

@@ -6166,6 +6166,7 @@ __metadata:
     cubic-spline: "npm:^3.0.3"
     deep-extend: "npm:0.6.0"
     ejson: "npm:^2.2.3"
+    globals: "npm:^15.14.0"
     i18next: "npm:^21.10.0"
     i18next-browser-languagedetector: "npm:^6.1.8"
     i18next-http-backend: "npm:^1.4.5"
@@ -15207,7 +15208,7 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"globals@npm:^15.11.0, globals@npm:^15.13.0":
+"globals@npm:^15.11.0, globals@npm:^15.13.0, globals@npm:^15.14.0":
   version: 15.14.0
   resolution: "globals@npm:15.14.0"
   checksum: 10c0/039deb8648bd373b7940c15df9f96ab7508fe92b31bbd39cbd1c1a740bd26db12457aa3e5d211553b234f30e9b1db2fee3683012f543a01a6942c9062857facb