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

package/dist/modules/controller.d.ts

@@ -17,7 +17,7 @@ export declare class InterfaceController extends ModuleController<InterfacePlugi
     onViewChanged: ({ isForce }?: InterfaceForcePayload) => Promise<unknown[]> | undefined;
     onTextChanged: ({ tokens, uid, tokensVisible }?: InterfaceTextChangedPayload) => Promise<unknown[] | undefined>;
     onWallChanged: ({ wall }?: InterfaceWallChangedPayload) => Promise<unknown[] | undefined>;
-    onSpeakerChanged: ({ speaker, meet }?: InterfaceSpeakerChangedPayload) => Promise<unknown[] | undefined>;
+    onSpeakerChanged: ({ speaker }?: InterfaceSpeakerChangedPayload) => Promise<unknown[] | undefined>;
     onVisibleChanged: ({ isForce }?: InterfaceForcePayload) => Promise<void>;
     onStateChanged: () => Promise<void>;
     getDefaultState: () => InterfacePluginState;

package/dist/modules/controller.js

@@ -1,5 +1,6 @@
 import { ModuleController } from "@vnejs/module.components";
 import { CONSTANTS as ControlsConstants } from "@vnejs/contracts.controls";
+import { getTextSpeakerInfo } from "@vnejs/contracts.text";
 export class InterfaceController extends ModuleController {
     name = "interface.controller";
     isStateChangeInProcess = false;
@@ -43,10 +44,11 @@ export class InterfaceController extends ModuleController {
             await this.waitRerender();
         return this.updateStateAndViewFast({ wall });
     };
-    onSpeakerChanged = async ({ speaker = "", meet = 0 } = {}) => {
+    onSpeakerChanged = async ({ speaker = "" } = {}) => {
         while (this.isStateChangeInProcess)
             await this.waitRerender();
-        return this.updateStateAndViewFast({ speaker, meet });
+        const speakerInfo = { ...getTextSpeakerInfo(this.globalState["text.speaker"], speaker) };
+        return this.updateStateAndViewFast({ speaker, speakerInfo });
     };
     onVisibleChanged = async ({ isForce = false } = {}) => {
         const { isVisible = false } = this.globalState.interface;
@@ -68,7 +70,7 @@ export class InterfaceController extends ModuleController {
         uid: "",
         tokensVisible: 0,
         speaker: "",
-        meet: 0,
+        speakerInfo: {},
         isShow: false,
         isVisible: false,
         isForce: false,

package/dist/modules/interface.d.ts

@@ -14,7 +14,7 @@ export declare class Interface extends ModuleCore<InterfacePluginEvents, Interfa
     onVisible: ({ isForce }?: InterfaceForcePayload) => Promise<unknown[]> | undefined;
     onTextChanged: ({ tokens, uid }?: InterfaceTextChangedPayload) => Promise<unknown[]> | undefined;
     onVisibleTokensChanged: ({ tokensVisible, uid }?: InterfaceVisibleTokensChangedPayload) => Promise<unknown[]> | undefined;
-    onTextSpeakerChanged: ({ speaker, meet }?: InterfaceSpeakerChangedPayload) => Promise<unknown[]> | undefined;
+    onTextSpeakerChanged: ({ speaker }?: InterfaceSpeakerChangedPayload) => Promise<unknown[]> | undefined;
     onTextEmitBefore: () => Promise<unknown[]> | undefined;
     onTextHide: () => Promise<unknown[]> | undefined;
     onView: ({ view, isForce }?: InterfaceViewPayload) => Promise<unknown[]> | undefined;
@@ -24,7 +24,7 @@ export declare class Interface extends ModuleCore<InterfacePluginEvents, Interfa
     setShow: (isShow: boolean, isForce?: boolean) => Promise<unknown[] | undefined>;
     setVisible: (isVisible: boolean, isForce?: boolean) => Promise<unknown[]> | undefined;
     emitTextChanged: (tokens?: InterfaceTextChangedPayload["tokens"], uid?: string, tokensVisible?: number) => Promise<unknown[]> | undefined;
-    emitSpeakerChanged: (speaker?: string, meet?: number) => Promise<unknown[]> | undefined;
+    emitSpeakerChanged: (speaker?: string) => Promise<unknown[]> | undefined;
     setNewState: (view?: string, isVisible?: boolean, isShow?: boolean) => Promise<unknown[]> | undefined;
     getDefaultState: () => InterfaceModuleState;
 }

package/dist/modules/interface.js

@@ -42,7 +42,7 @@ export class Interface extends ModuleCore {
         return this.emitTextChanged(tokens, uid, tokensVisible);
     };
     onVisibleTokensChanged = ({ tokensVisible = 0, uid = "" } = {}) => this.emitTextChanged(this.globalState.text.tokens, uid, tokensVisible);
-    onTextSpeakerChanged = ({ speaker, meet } = {}) => this.emitSpeakerChanged(speaker, meet);
+    onTextSpeakerChanged = ({ speaker } = {}) => this.emitSpeakerChanged(speaker);
     onTextEmitBefore = () => this.emit(this.EVENTS.INTERFACE.SHOW);
     onTextHide = () => this.emitTextChanged([], "", 0);
     onView = ({ view, isForce = false } = {}) => this.setView(view, isForce);
@@ -66,7 +66,7 @@ export class Interface extends ModuleCore {
         return this.emit(this.EVENTS.INTERFACE.VISIBLE_CHANGED, { isForce });
     };
     emitTextChanged = (tokens = [], uid = "", tokensVisible) => this.emit(this.EVENTS.INTERFACE.TEXT_CHANGED, { tokens, uid, tokensVisible });
-    emitSpeakerChanged = (speaker = "", meet = 0) => this.emit(this.EVENTS.INTERFACE.SPEAKER_CHANGED, { speaker, meet });
+    emitSpeakerChanged = (speaker = "") => this.emit(this.EVENTS.INTERFACE.SPEAKER_CHANGED, { speaker });
     setNewState = (view, isVisible, isShow) => {
         Object.assign(this.state, { isShow, view, isVisible });
         return this.emit(this.EVENTS.INTERFACE.STATE_CHANGED);

package/dist/utils/interface.d.ts

@@ -1,5 +1,5 @@
 import type { ModuleControllerState } from "@vnejs/module.components";
-import type { TokenizedChar } from "@vnejs/contracts.text";
+import type { TextSpeakerEntry, TokenizedChar } from "@vnejs/contracts.text";
 import type { WallElement } from "@vnejs/contracts.text.wall";
 import type { InterfaceModuleState } from "@vnejs/contracts.views.scenario.interface";
 export type { InterfaceModuleState };
@@ -9,7 +9,7 @@ export type InterfaceRuntimeState = {
     uid: string;
     tokensVisible: number;
     speaker: string;
-    meet: number;
+    speakerInfo: TextSpeakerEntry;
 };
 export type InterfacePluginState = ModuleControllerState & InterfaceModuleState & InterfaceRuntimeState & {
     isFast?: boolean;
@@ -39,5 +39,4 @@ export type InterfaceWallChangedPayload = {
 };
 export type InterfaceSpeakerChangedPayload = {
     speaker?: string;
-    meet?: number;
 };

package/dist/view/components/InterfaceViewWall.js

@@ -2,13 +2,14 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Flex, PositionBox, Scrollbar, SmoothText, Text, useMemo } from "@vnejs/uis.react";
 import { useTokensHook } from "./tokens.hook.js";
 const renderOneText = (wallElement) => (_jsxs("div", { children: [wallElement.speakerName && (_jsx(Text, { ...wallElement.propsByView.text, isInlineBlock: true, color: wallElement.speakerColor, text: `${wallElement.speakerName}:`, marginRight: 12 })), _jsx(SmoothText, { ...wallElement.propsByView.text, isNoScrollBar: true, color: wallElement.color, opacity: wallElement.opacity, transition: wallElement.transition, tokens: wallElement.tokens, tokensVisibleForce: wallElement.tokensVisible })] }, wallElement.uid));
-const mapWall = ({ uid = "", tokens = [], speaker = "", meet = 0, transition = 0, props, }) => {
+const mapWall = ({ uid = "", tokens = [], speaker = "", speakerInfo = {}, transition = 0, props, }) => {
     const propsByView = props.PARAMS.INTERFACE.VIEW_PROPS.wall;
     const speakersInfo = props.PARAMS.TEXT.SPEAKERS_INFO;
-    const speakerInfo = speakersInfo[speaker] ?? speakersInfo[props.PARAMS.TEXT.DEFAULT_SPEAKER_NAME];
-    const { color, opacity = 1, speakerColor = "white" } = speakerInfo;
+    const speakerStyleInfo = speakersInfo[speaker] ?? speakersInfo[props.PARAMS.TEXT.DEFAULT_SPEAKER_NAME];
+    const { color, opacity = 1, speakerColor = "white" } = speakerStyleInfo;
     const locs = props.locs ?? {};
-    const speakerName = locs[`speaker.${speaker}.${meet ?? 0}`];
+    const meet = speakerInfo.meet ?? 0;
+    const speakerName = locs[`speaker.${speaker}.${meet}`];
     return { speakerName, speakerColor, uid, color, opacity, tokens, tokensVisible: tokens.length, transition, propsByView };
 };
 export const InterfaceViewWall = (props) => {

package/dist/view/index.js

@@ -5,15 +5,16 @@ const Interface = (props) => {
     const { store, onMount, emit, EVENTS, PARAMS } = props;
     const state = useStoreState(store, onMount);
     const { isShow = false, isVisible = false, isForce = false, tokensVisible = 0, view = "", locs = {} } = state;
-    const { speaker = "", meet = 0, tokens = [], wall = [], postfix = "", prefix = "", uid = "" } = state;
+    const { speaker = "", speakerInfo = {}, tokens = [], wall = [], postfix = "", prefix = "", uid = "" } = state;
     const onClick = useCallback(() => emit(EVENTS.INTERFACE.INTERACT), [emit, EVENTS.INTERFACE.INTERACT]);
     const isRealForce = useIsForceHook(isForce);
-    const speakerName = locs[`speaker.${speaker}.${meet ?? 0}`];
+    const meet = speakerInfo.meet ?? 0;
+    const speakerName = locs[`speaker.${speaker}.${meet}`];
     const speakerText = speakerName ? `${`${locs[`prefix.${prefix}`] ?? ""} `}${speakerName}${` ${locs[`postfix.${postfix}`] ?? ""}`}` : ".";
     const transition = isRealForce ? 0 : PARAMS.INTERFACE.TRANSITION;
     const speakersInfo = PARAMS.TEXT.SPEAKERS_INFO;
-    const speakerInfo = speakersInfo[speaker] ?? speakersInfo[PARAMS.TEXT.DEFAULT_SPEAKER_NAME];
-    const { color, opacity = 1, speakerColor = "white" } = speakerInfo;
+    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]);
     const propsSpeaker = useMemo(() => ({ speakerText, speakerName, speakerColor }), [speakerText, speakerName, speakerColor]);
     const propsText = useMemo(() => ({ opacity, color }), [opacity, color]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vnejs/plugins.views.scenario.interface",
-  "version": "0.1.30",
+  "version": "0.1.31",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/modules/controller.ts

@@ -1,6 +1,7 @@
 import { ModuleController } from "@vnejs/module.components";
 import type { ControlsPopPayload, ControlsPushPayload } from "@vnejs/module.components";
 import { CONSTANTS as ControlsConstants } from "@vnejs/contracts.controls";
+import { getTextSpeakerInfo } from "@vnejs/contracts.text";
 
 import type { InterfacePluginConstants, InterfacePluginEvents, InterfacePluginParams, InterfacePluginSettings } from "../types.js";
 import type {
@@ -66,10 +67,12 @@ export class InterfaceController extends ModuleController<
 
     return this.updateStateAndViewFast({ wall });
   };
-  onSpeakerChanged = async ({ speaker = "", meet = 0 }: InterfaceSpeakerChangedPayload = {}) => {
+  onSpeakerChanged = async ({ speaker = "" }: InterfaceSpeakerChangedPayload = {}) => {
     while (this.isStateChangeInProcess) await this.waitRerender();
 
-    return this.updateStateAndViewFast({ speaker, meet });
+    const speakerInfo = { ...getTextSpeakerInfo(this.globalState["text.speaker"], speaker) };
+
+    return this.updateStateAndViewFast({ speaker, speakerInfo });
   };
   onVisibleChanged = async ({ isForce = false }: InterfaceForcePayload = {}) => {
     const { isVisible = false } = this.globalState.interface;
@@ -96,7 +99,7 @@ export class InterfaceController extends ModuleController<
     uid: "",
     tokensVisible: 0,
     speaker: "",
-    meet: 0,
+    speakerInfo: {},
     isShow: false,
     isVisible: false,
     isForce: false,

package/src/modules/interface.ts

@@ -71,7 +71,7 @@ export class Interface extends ModuleCore<
   };
   onVisibleTokensChanged = ({ tokensVisible = 0, uid = "" }: InterfaceVisibleTokensChangedPayload = {}) =>
     this.emitTextChanged(this.globalState.text.tokens, uid, tokensVisible);
-  onTextSpeakerChanged = ({ speaker, meet }: InterfaceSpeakerChangedPayload = {}) => this.emitSpeakerChanged(speaker, meet);
+  onTextSpeakerChanged = ({ speaker }: InterfaceSpeakerChangedPayload = {}) => this.emitSpeakerChanged(speaker);
   onTextEmitBefore = () => this.emit(this.EVENTS.INTERFACE.SHOW);
   onTextHide = () => this.emitTextChanged([], "", 0);
   onView = ({ view, isForce = false }: InterfaceViewPayload = {}) => this.setView(view, isForce);
@@ -101,7 +101,7 @@ export class Interface extends ModuleCore<
   };
   emitTextChanged = (tokens: InterfaceTextChangedPayload["tokens"] = [], uid = "", tokensVisible?: number) =>
     this.emit(this.EVENTS.INTERFACE.TEXT_CHANGED, { tokens, uid, tokensVisible });
-  emitSpeakerChanged = (speaker = "", meet = 0) => this.emit(this.EVENTS.INTERFACE.SPEAKER_CHANGED, { speaker, meet });
+  emitSpeakerChanged = (speaker = "") => this.emit(this.EVENTS.INTERFACE.SPEAKER_CHANGED, { speaker });
   setNewState = (view?: string, isVisible?: boolean, isShow?: boolean) => {
     Object.assign(this.state, { isShow, view, isVisible });
 

package/src/utils/interface.ts

@@ -1,5 +1,5 @@
 import type { ModuleControllerState } from "@vnejs/module.components";
-import type { TokenizedChar } from "@vnejs/contracts.text";
+import type { TextSpeakerEntry, TokenizedChar } from "@vnejs/contracts.text";
 import type { WallElement } from "@vnejs/contracts.text.wall";
 import type { InterfaceModuleState } from "@vnejs/contracts.views.scenario.interface";
 
@@ -11,7 +11,7 @@ export type InterfaceRuntimeState = {
   uid: string;
   tokensVisible: number;
   speaker: string;
-  meet: number;
+  speakerInfo: TextSpeakerEntry;
 };
 
 export type InterfacePluginState = ModuleControllerState &
@@ -49,5 +49,4 @@ export type InterfaceWallChangedPayload = {
 
 export type InterfaceSpeakerChangedPayload = {
   speaker?: string;
-  meet?: number;
 };

package/src/view/components/InterfaceViewWall.tsx

@@ -46,16 +46,17 @@ const mapWall = ({
   uid = "",
   tokens = [],
   speaker = "",
-  meet = 0,
+  speakerInfo = {},
   transition = 0,
   props,
 }: WallElement & { transition?: number; props: InterfaceViewProps }) => {
   const propsByView = props.PARAMS.INTERFACE.VIEW_PROPS.wall;
   const speakersInfo = props.PARAMS.TEXT.SPEAKERS_INFO;
-  const speakerInfo: TextSpeakerInfo = speakersInfo[speaker] ?? speakersInfo[props.PARAMS.TEXT.DEFAULT_SPEAKER_NAME];
-  const { color, opacity = 1, speakerColor = "white" } = speakerInfo;
+  const speakerStyleInfo: TextSpeakerInfo = speakersInfo[speaker] ?? speakersInfo[props.PARAMS.TEXT.DEFAULT_SPEAKER_NAME];
+  const { color, opacity = 1, speakerColor = "white" } = speakerStyleInfo;
   const locs = props.locs ?? {};
-  const speakerName = locs[`speaker.${speaker}.${meet ?? 0}`];
+  const meet = speakerInfo.meet ?? 0;
+  const speakerName = locs[`speaker.${speaker}.${meet}`];
 
   return { speakerName, speakerColor, uid, color, opacity, tokens, tokensVisible: tokens.length, transition, propsByView };
 };

package/src/view/index.tsx

@@ -20,19 +20,20 @@ const Interface = (props: InterfaceComponentProps) => {
   const state = useStoreState<InterfacePluginState>(store, onMount);
 
   const { isShow = false, isVisible = false, isForce = false, tokensVisible = 0, view = "", locs = {} } = state;
-  const { speaker = "", meet = 0, tokens = [], wall = [], postfix = "", prefix = "", uid = "" } = state;
+  const { speaker = "", speakerInfo = {}, tokens = [], wall = [], postfix = "", prefix = "", uid = "" } = state;
 
   const onClick = useCallback(() => emit(EVENTS.INTERFACE.INTERACT), [emit, EVENTS.INTERFACE.INTERACT]);
 
   const isRealForce = useIsForceHook(isForce);
 
-  const speakerName = locs[`speaker.${speaker}.${meet ?? 0}`];
+  const meet = speakerInfo.meet ?? 0;
+  const speakerName = locs[`speaker.${speaker}.${meet}`];
   const speakerText = speakerName ? `${`${locs[`prefix.${prefix}`] ?? ""} `}${speakerName}${` ${locs[`postfix.${postfix}`] ?? ""}`}` : ".";
   const transition = isRealForce ? 0 : PARAMS.INTERFACE.TRANSITION;
   const speakersInfo = PARAMS.TEXT.SPEAKERS_INFO;
-  const speakerInfo: TextSpeakerInfo = speakersInfo[speaker] ?? speakersInfo[PARAMS.TEXT.DEFAULT_SPEAKER_NAME];
+  const speakerStyleInfo: TextSpeakerInfo = speakersInfo[speaker] ?? speakersInfo[PARAMS.TEXT.DEFAULT_SPEAKER_NAME];
 
-  const { color, opacity = 1, speakerColor = "white" } = speakerInfo;
+  const { color, opacity = 1, speakerColor = "white" } = speakerStyleInfo;
 
   const propsCommon = useMemo(
     () => ({ isForce: isRealForce, transition, tokensVisible, tokens, wall, uid, locs }),