@vnejs/plugins.views.scenario.interface 0.1.31 → 0.1.33

package/dist/index.d.ts

@@ -1 +1,2 @@
 import "@vnejs/contracts.views.scenario.interface";
+import "@vnejs/contracts.text.meet";

package/dist/index.js

@@ -1,4 +1,5 @@
 import "@vnejs/contracts.views.scenario.interface";
+import "@vnejs/contracts.text.meet";
 import { regPlugin } from "@vnejs/shared";
 import { PARAMS, PLUGIN_NAME, SUBSCRIBE_EVENTS } from "@vnejs/contracts.views.scenario.interface";
 import { InterfaceController } from "./modules/controller.js";

package/dist/view/components/InterfaceViewWall.js

@@ -9,7 +9,11 @@ const mapWall = ({ uid = "", tokens = [], speaker = "", speakerInfo = {}, transi
     const { color, opacity = 1, speakerColor = "white" } = speakerStyleInfo;
     const locs = props.locs ?? {};
     const meet = speakerInfo.meet ?? 0;
-    const speakerName = locs[`speaker.${speaker}.${meet}`];
+    const defaultSpeakerName = props.PARAMS.TEXT.DEFAULT_SPEAKER_NAME;
+    const speakerName = locs[`speaker.${speaker}.${meet}`] ??
+        locs[`speaker.${speaker}`] ??
+        speakersInfo[speaker]?.displayName ??
+        (speaker !== defaultSpeakerName ? speaker : undefined);
     return { speakerName, speakerColor, uid, color, opacity, tokens, tokensVisible: tokens.length, transition, propsByView };
 };
 export const InterfaceViewWall = (props) => {

package/dist/view/index.js

@@ -9,10 +9,14 @@ const Interface = (props) => {
     const onClick = useCallback(() => emit(EVENTS.INTERFACE.INTERACT), [emit, EVENTS.INTERFACE.INTERACT]);
     const isRealForce = useIsForceHook(isForce);
     const meet = speakerInfo.meet ?? 0;
-    const speakerName = locs[`speaker.${speaker}.${meet}`];
+    const speakersInfo = PARAMS.TEXT.SPEAKERS_INFO;
+    const defaultSpeakerName = PARAMS.TEXT.DEFAULT_SPEAKER_NAME;
+    const speakerName = useMemo(() => locs[`speaker.${speaker}.${meet}`] ??
+        locs[`speaker.${speaker}`] ??
+        speakersInfo[speaker]?.displayName ??
+        (speaker !== defaultSpeakerName ? speaker : undefined), [locs, speaker, meet, speakersInfo, defaultSpeakerName]);
     const speakerText = speakerName ? `${`${locs[`prefix.${prefix}`] ?? ""} `}${speakerName}${` ${locs[`postfix.${postfix}`] ?? ""}`}` : ".";
     const transition = isRealForce ? 0 : PARAMS.INTERFACE.TRANSITION;
-    const speakersInfo = PARAMS.TEXT.SPEAKERS_INFO;
     const speakerStyleInfo = speakersInfo[speaker] ?? speakersInfo[PARAMS.TEXT.DEFAULT_SPEAKER_NAME];
     const { color, opacity = 1, speakerColor = "white" } = speakerStyleInfo;
     const propsCommon = useMemo(() => ({ isForce: isRealForce, transition, tokensVisible, tokens, wall, uid, locs }), [isRealForce, transition, tokensVisible, tokens, wall, uid, locs]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vnejs/plugins.views.scenario.interface",
-  "version": "0.1.31",
+  "version": "0.1.33",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -37,6 +37,7 @@
     "@vnejs/module.core": "~0.1.0",
     "@vnejs/module.components": "~0.1.0",
     "@vnejs/contracts.text": "~0.1.0",
+    "@vnejs/contracts.text.meet": "~0.1.0",
     "@vnejs/contracts.text.wall": "~0.1.0",
     "@vnejs/shared": "~0.1.0",
     "@vnejs/uis.react": "~0.1.0",

package/src/index.ts

@@ -1,4 +1,5 @@
 import "@vnejs/contracts.views.scenario.interface";
+import "@vnejs/contracts.text.meet";
 
 import { regPlugin } from "@vnejs/shared";
 import { PARAMS, PLUGIN_NAME, SUBSCRIBE_EVENTS } from "@vnejs/contracts.views.scenario.interface";

package/src/view/components/InterfaceViewWall.tsx

@@ -56,7 +56,12 @@ const mapWall = ({
   const { color, opacity = 1, speakerColor = "white" } = speakerStyleInfo;
   const locs = props.locs ?? {};
   const meet = speakerInfo.meet ?? 0;
-  const speakerName = locs[`speaker.${speaker}.${meet}`];
+  const defaultSpeakerName = props.PARAMS.TEXT.DEFAULT_SPEAKER_NAME;
+  const speakerName =
+    locs[`speaker.${speaker}.${meet}`] ??
+    locs[`speaker.${speaker}`] ??
+    speakersInfo[speaker]?.displayName ??
+    (speaker !== defaultSpeakerName ? speaker : undefined);
 
   return { speakerName, speakerColor, uid, color, opacity, tokens, tokensVisible: tokens.length, transition, propsByView };
 };

package/src/view/index.tsx

@@ -27,10 +27,18 @@ const Interface = (props: InterfaceComponentProps) => {
   const isRealForce = useIsForceHook(isForce);
 
   const meet = speakerInfo.meet ?? 0;
-  const speakerName = locs[`speaker.${speaker}.${meet}`];
+  const speakersInfo = PARAMS.TEXT.SPEAKERS_INFO;
+  const defaultSpeakerName = PARAMS.TEXT.DEFAULT_SPEAKER_NAME;
+  const speakerName = useMemo(
+    () =>
+      locs[`speaker.${speaker}.${meet}`] ??
+      locs[`speaker.${speaker}`] ??
+      speakersInfo[speaker]?.displayName ??
+      (speaker !== defaultSpeakerName ? speaker : undefined),
+    [locs, speaker, meet, speakersInfo, defaultSpeakerName],
+  );
   const speakerText = speakerName ? `${`${locs[`prefix.${prefix}`] ?? ""} `}${speakerName}${` ${locs[`postfix.${postfix}`] ?? ""}`}` : ".";
   const transition = isRealForce ? 0 : PARAMS.INTERFACE.TRANSITION;
-  const speakersInfo = PARAMS.TEXT.SPEAKERS_INFO;
   const speakerStyleInfo: TextSpeakerInfo = speakersInfo[speaker] ?? speakersInfo[PARAMS.TEXT.DEFAULT_SPEAKER_NAME];
 
   const { color, opacity = 1, speakerColor = "white" } = speakerStyleInfo;