wip: update property name

nrkno · May 24, 2024 · 3361f66 · 3361f66
1 parent 3336847
commit 3361f66
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 19 deletions.
diff --git a/packages/input-gateway/src/inputManagerHandler.ts b/packages/input-gateway/src/inputManagerHandler.ts
@@ -625,7 +625,7 @@ export class InputManagerHandler {
 		let contentLayerLongName: string | undefined
 		let contentLayerShortName: string | undefined
 		let tally: Tally = Tally.NONE
-		let stylePreset: string | undefined
+		let styleClassNames: string | undefined
 
 		if (actionId) {
 			const previewedAdlibs = this.#coreHandler.core
@@ -643,7 +643,8 @@ export class InputManagerHandler {
 				contentTypes = previewedAdlibs
 					.map((adlib) => adlib.sourceLayerType)
 					.filter((a) => a !== undefined) as SourceLayerType[]
-				stylePreset = previewedAdlibs[0].stylePreset
+				// @ts-expect-error lazy
+				styleClassNames = previewedAdlibs[0].styleClassNames
 			}
 		}
 
@@ -660,7 +661,7 @@ export class InputManagerHandler {
 			content: contentLabel ? { long: contentLabel } : undefined,
 			classNames: InputManagerHandler.buildFeedbackClassNames(mountedTrigger, contentTypes),
 			tally,
-			stylePreset,
+			styleClassNames,
 		})
 	}
 }
diff --git a/packages/input-manager/src/feedback/feedback.ts b/packages/input-manager/src/feedback/feedback.ts
@@ -58,16 +58,12 @@ export interface Feedback {
 	content?: Label
 	/** The label for the type of content attached to this Action */
 	contentClass?: Label
-	// /** The duration of the content attached to this Action */
-	// duration?: string
 	/** The tally state bitmap */
 	tally?: Tally
 	/** Various classes attached to this Action - including the ones defined in `ClassNames` */
 	classNames?: string[]
-	// /** A PNG image of the content attached to this Action */
-	// thumbnail?: Blob
-	/** The id of the style preset to use when drawing the button */
-	stylePreset?: string
+	/** Space separated list of class names to use when drawing the button */
+	styleClassNames?: string
 }
 
 export type SomeFeedback = Feedback | null

diff --git a/packages/input-manager/src/integrations/streamdeck/index.ts b/packages/input-manager/src/integrations/streamdeck/index.ts
@@ -250,19 +250,27 @@ export class StreamDeckDevice extends Device {
 	}
 
 	private convertFeedbackToBitmapFeedback(feedback: Feedback): BitmapFeedback | Feedback {
-		const stylePresetId = feedback.stylePreset
-		if (!stylePresetId || !this.config.stylePresets) return feedback
+		const styleClassNames = feedback.styleClassNames
+		if (!styleClassNames || !this.config.stylePresets) return feedback
 
-		const stylePreset = Object.values<StreamdeckStylePreset>(this.config.stylePresets).find(
-			(preset) => preset.id === stylePresetId
-		)
-		if (!stylePreset) return feedback
+		console.log('test', styleClassNames)
+
+		// Find the first match
+		for (const name of styleClassNames.split(' ')) {
+			const stylePreset = Object.values<StreamdeckStylePreset>(this.config.stylePresets).find(
+				(preset) => preset.id === name
+			)
 
-		return {
-			...feedback,
-			backgroundImage: stylePreset.backgroundImage,
-			hideText: !stylePreset.drawText,
+			if (stylePreset) {
+				return {
+					...feedback,
+					backgroundImage: stylePreset.backgroundImage,
+					hideText: !stylePreset.drawText,
+				}
+			}
 		}
+
+		return feedback
 	}
 
 	private quietUpdateFeedbackWithDownState = (trigger: string): void => {