@vnejs/plugins.views.scenario.interface 0.1.14 → 0.1.15

package/dist/modules/interface.d.ts

@@ -1,6 +1,6 @@
-import { Module } from "@vnejs/module";
+import { Module, type ModuleGlobalStateRegistry } from "@vnejs/module";
 import type { InterfacePluginConstants, InterfacePluginEvents, InterfacePluginParams, InterfacePluginSettings } from "../types.js";
-import type { InterfaceForcePayload, InterfaceLineExecPayload, InterfaceModuleState, InterfaceSpeakerChangedPayload, InterfaceStateSetPayload, InterfaceTextChangedPayload, InterfaceViewPayload } from "../utils/interface.js";
+import type { InterfaceForcePayload, InterfaceLineExecPayload, InterfaceModuleState, InterfaceSpeakerChangedPayload, InterfaceTextChangedPayload, InterfaceViewPayload } from "../utils/interface.js";
 export declare class Interface extends Module<InterfacePluginEvents, InterfacePluginConstants, InterfacePluginSettings, InterfacePluginParams, InterfaceModuleState> {
     name: string;
     subscribe: () => void;
@@ -15,7 +15,7 @@ export declare class Interface extends Module<InterfacePluginEvents, InterfacePl
     onTextEmitBefore: () => Promise<unknown[]> | undefined;
     onTextHide: () => Promise<unknown[]> | undefined;
     onView: ({ view, isForce }?: InterfaceViewPayload) => Promise<unknown[]> | undefined;
-    onStateSet: ({ [this.name]: state }?: InterfaceStateSetPayload) => Promise<unknown[]> | undefined;
+    onStateSet: (payload: ModuleGlobalStateRegistry) => Promise<unknown[]> | undefined;
     onStateClear: () => Promise<unknown[]> | undefined;
     setView: (view?: string, isForce?: boolean) => Promise<unknown[]> | undefined;
     setShow: (isShow: boolean, isForce?: boolean) => Promise<unknown[] | undefined>;

package/dist/modules/interface.js

@@ -36,7 +36,10 @@ export class Interface extends Module {
     onTextEmitBefore = () => this.emit(this.EVENTS.INTERFACE.SHOW);
     onTextHide = () => this.setText([], [], "", 0);
     onView = ({ view, isForce = false } = {}) => this.setView(view, isForce);
-    onStateSet = ({ [this.name]: state } = {}) => this.setNewState(state?.view, state?.isVisible, state?.isShow);
+    onStateSet = (payload) => {
+        const moduleState = this.getStateSlice(payload);
+        return this.setNewState(moduleState?.view, moduleState?.isVisible, moduleState?.isShow);
+    };
     onStateClear = () => this.setNewState(this.PARAMS.INTERFACE.DEFAULT_VIEW, false, false);
     setView = (view, isForce = false) => {
         this.state.view = view ?? "";

package/dist/utils/interface.d.ts

@@ -2,14 +2,6 @@ import type { ModuleControllerState } from "@vnejs/module.components";
 import type { TokenizedChar, WallElement } from "@vnejs/plugins.text.contract";
 import type { InterfaceModuleState } from "@vnejs/plugins.views.scenario.interface.contract";
 export type { InterfaceModuleState };
-export type InterfaceSpeakerInfo = {
-    color?: string;
-    opacity?: number;
-    speakerColor?: string;
-    names?: Record<string, string[] | undefined> & {
-        default?: string[];
-    };
-};
 export type InterfacePluginState = ModuleControllerState & InterfaceModuleState & {
     isFast?: boolean;
     locs?: Record<string, string>;
@@ -41,4 +33,3 @@ export type InterfaceSpeakerChangedPayload = {
     speaker?: string;
     meet?: number;
 };
-export type InterfaceStateSetPayload = Record<string, Pick<InterfaceModuleState, "view" | "isVisible" | "isShow"> | undefined>;

package/dist/view/components/InterfaceViewWall.js

@@ -2,13 +2,13 @@ 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 = "", meet = 0, transition = 0, props, }) => {
     const propsByView = props.PARAMS.INTERFACE.VIEW_PROPS.wall;
     const speakersInfo = props.PARAMS.TEXT.SPEAKERS_INFO;
-    const speakerInfo = speakersInfo[speaker] || speakersInfo.default || {};
-    const { color, opacity = 1, names = {}, speakerColor = "white" } = speakerInfo;
-    const langNames = names[props.shared.lang ?? ""] || names.default || [];
-    const speakerName = langNames[meet] || langNames[langNames.length - 1];
+    const speakerInfo = speakersInfo[speaker] ?? speakersInfo[props.PARAMS.TEXT.DEFAULT_SPEAKER_NAME];
+    const { color, opacity = 1, speakerColor = "white" } = speakerInfo;
+    const locs = props.locs ?? {};
+    const speakerName = locs[`speaker.${speaker}.${meet ?? 0}`];
     return { speakerName, speakerColor, uid, color, opacity, tokens, tokensVisible: tokens.length, transition, propsByView };
 };
 export const InterfaceViewWall = (props) => {

package/dist/view/index.js

@@ -12,9 +12,9 @@ const Interface = (props) => {
     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 speakerInfo = speakersInfo[speaker] ?? speakersInfo[PARAMS.TEXT.DEFAULT_SPEAKER_NAME];
     const { color, opacity = 1, speakerColor = "white" } = speakerInfo;
-    const propsCommon = useMemo(() => ({ isForce: isRealForce, transition, tokensVisible, tokens, wall, uid }), [isRealForce, transition, tokensVisible, tokens, wall, uid]);
+    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]);
     const propsView = useMemo(() => ({ ...propsCommon, ...propsSpeaker, ...propsText }), [propsCommon, propsSpeaker, propsText]);

package/package.json

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

package/src/modules/interface.ts

@@ -1,4 +1,4 @@
-import { Module } from "@vnejs/module";
+import { Module, type ModuleGlobalStateRegistry } from "@vnejs/module";
 import { tokenizeExecLine } from "@vnejs/helpers";
 
 import type { InterfacePluginConstants, InterfacePluginEvents, InterfacePluginParams, InterfacePluginSettings } from "../types.js";
@@ -7,7 +7,6 @@ import type {
   InterfaceLineExecPayload,
   InterfaceModuleState,
   InterfaceSpeakerChangedPayload,
-  InterfaceStateSetPayload,
   InterfaceTextChangedPayload,
   InterfaceViewPayload,
 } from "../utils/interface.js";
@@ -54,7 +53,11 @@ export class Interface extends Module<InterfacePluginEvents, InterfacePluginCons
   onTextEmitBefore = () => this.emit(this.EVENTS.INTERFACE.SHOW);
   onTextHide = () => this.setText([], [], "", 0);
   onView = ({ view, isForce = false }: InterfaceViewPayload = {}) => this.setView(view, isForce);
-  onStateSet = ({ [this.name]: state }: InterfaceStateSetPayload = {}) => this.setNewState(state?.view, state?.isVisible, state?.isShow);
+  onStateSet = (payload: ModuleGlobalStateRegistry) => {
+    const moduleState = this.getStateSlice(payload);
+
+    return this.setNewState(moduleState?.view, moduleState?.isVisible, moduleState?.isShow);
+  };
   onStateClear = () => this.setNewState(this.PARAMS.INTERFACE.DEFAULT_VIEW, false, false);
 
   setView = (view?: string, isForce = false) => {

package/src/utils/interface.ts

@@ -4,13 +4,6 @@ import type { InterfaceModuleState } from "@vnejs/plugins.views.scenario.interfa
 
 export type { InterfaceModuleState };
 
-export type InterfaceSpeakerInfo = {
-  color?: string;
-  opacity?: number;
-  speakerColor?: string;
-  names?: Record<string, string[] | undefined> & { default?: string[] };
-};
-
 export type InterfacePluginState = ModuleControllerState &
   InterfaceModuleState & {
     isFast?: boolean;
@@ -48,5 +41,3 @@ export type InterfaceSpeakerChangedPayload = {
   speaker?: string;
   meet?: number;
 };
-
-export type InterfaceStateSetPayload = Record<string, Pick<InterfaceModuleState, "view" | "isVisible" | "isShow"> | undefined>;

package/src/view/components/InterfaceViewWall.tsx

@@ -1,10 +1,9 @@
-import type { TokenizedChar, WallElement } from "@vnejs/plugins.text.contract";
+import type { TextSpeakerInfo, TokenizedChar, WallElement } from "@vnejs/plugins.text.contract";
 import { Flex, PositionBox, Scrollbar, SmoothText, Text, useMemo } from "@vnejs/uis.react";
 
 import type { Params as InterfaceContractParams } from "@vnejs/plugins.views.scenario.interface.contract";
 
 import type { InterfaceViewProps } from "../../types.js";
-import type { InterfaceSpeakerInfo } from "../../utils/interface.js";
 import { useTokensHook } from "./tokens.hook.js";
 
 type WallTextElement = {
@@ -42,14 +41,20 @@ const renderOneText = (wallElement: WallTextElement) => (
   </div>
 );
 
-const mapWall = ({ uid = "", tokens = [], speaker = "", meet = 0, transition = 0, props }: WallElement & { transition?: number; props: InterfaceViewProps }) => {
+const mapWall = ({
+  uid = "",
+  tokens = [],
+  speaker = "",
+  meet = 0,
+  transition = 0,
+  props,
+}: WallElement & { transition?: number; props: InterfaceViewProps }) => {
   const propsByView = props.PARAMS.INTERFACE.VIEW_PROPS.wall;
-  const speakersInfo = props.PARAMS.TEXT.SPEAKERS_INFO as Record<string, InterfaceSpeakerInfo>;
-  const speakerInfo = speakersInfo[speaker] || speakersInfo.default || {};
-  const { color, opacity = 1, names = {}, speakerColor = "white" } = speakerInfo;
-
-  const langNames = names[(props.shared as { lang?: string }).lang ?? ""] || names.default || [];
-  const speakerName = langNames[meet] || langNames[langNames.length - 1];
+  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 locs = props.locs ?? {};
+  const speakerName = locs[`speaker.${speaker}.${meet ?? 0}`];
 
   return { speakerName, speakerColor, uid, color, opacity, tokens, tokensVisible: tokens.length, transition, propsByView };
 };
@@ -71,7 +76,10 @@ export const InterfaceViewWall = (props: InterfaceViewProps) => {
 
   const propsByView = PARAMS.INTERFACE.VIEW_PROPS.wall;
 
-  const propsPosition = useMemo(() => ({ ...propsByView.position, opacity: isViewActive ? 1 : 0, transition }), [isViewActive, transition, propsByView.position]);
+  const propsPosition = useMemo(
+    () => ({ ...propsByView.position, opacity: isViewActive ? 1 : 0, transition }),
+    [isViewActive, transition, propsByView.position],
+  );
   const wallWithProps = useMemo(() => wall.map((item) => ({ ...item, transition, props })), [wall, transition, props]);
 
   const { realTokens, realTokensVisible } = useTokensHook(isViewActive, tokens, tokensVisible, uid);

package/src/view/index.tsx

@@ -1,9 +1,10 @@
 import type { ViewRenderFunc } from "@vnejs/module.components";
+import type { TextSpeakerInfo } from "@vnejs/plugins.text.contract";
 import type { ReactComponentProps } from "@vnejs/uis.react";
 import { Screen, createRenderFunc, useCallback, useIsForceHook, useMemo, useStoreState } from "@vnejs/uis.react";
 
 import type { InterfacePluginConstants, InterfacePluginEvents, InterfacePluginParams, InterfacePluginSettings } from "../types.js";
-import type { InterfacePluginState, InterfaceSpeakerInfo } from "../utils/interface.js";
+import type { InterfacePluginState } from "../utils/interface.js";
 import { InterfaceBackdrop, InterfaceViewDialog, InterfaceViewLine, InterfaceViewWall } from "./components/index.js";
 
 type InterfaceComponentProps = ReactComponentProps<
@@ -28,14 +29,14 @@ const Interface = (props: InterfaceComponentProps) => {
   const speakerName = locs[`speaker.${speaker}.${meet ?? 0}`];
   const speakerText = speakerName ? `${`${locs[`prefix.${prefix}`] ?? ""} `}${speakerName}${` ${locs[`postfix.${postfix}`] ?? ""}`}` : ".";
   const transition = isRealForce ? 0 : PARAMS.INTERFACE.TRANSITION;
-  const speakersInfo = PARAMS.TEXT.SPEAKERS_INFO as Record<string, InterfaceSpeakerInfo>;
-  const speakerInfo = speakersInfo[speaker] || speakersInfo[PARAMS.TEXT.DEFAULT_SPEAKER_NAME] || {};
+  const speakersInfo = PARAMS.TEXT.SPEAKERS_INFO;
+  const speakerInfo: TextSpeakerInfo = speakersInfo[speaker] ?? speakersInfo[PARAMS.TEXT.DEFAULT_SPEAKER_NAME];
 
   const { color, opacity = 1, speakerColor = "white" } = speakerInfo;
 
   const propsCommon = useMemo(
-    () => ({ isForce: isRealForce, transition, tokensVisible, tokens, wall, uid }),
-    [isRealForce, transition, tokensVisible, tokens, wall, uid],
+    () => ({ 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]);