npm - @memori.ai/memori-react - Versions diffs - 7.6.1 → 7.7.0 - Mend

@memori.ai/memori-react 7.6.1 → 7.7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (139) hide show

package/CHANGELOG.md CHANGED Viewed

@@ -1,11 +1,29 @@
+## [7.7.0](https://github.com/memori-ai/memori-react/compare/v7.6.1...v7.7.0) (2024-10-15)
+### Features
+* improve lip sync ([#20](https://github.com/memori-ai/memori-react/issues/20)) ([e13f520](https://github.com/memori-ai/memori-react/commit/e13f520eb91bd8af1cc42578da29316f0b25033e))
+### Bug Fixes
+* avatar 3d animations, fine tuned lip sync values and removed useless function to useEffect ([1a51c26](https://github.com/memori-ai/memori-react/commit/1a51c26a0220bc9a312c7c34072188e642742111))
+### Changes
+* translate api as post ([04a963c](https://github.com/memori-ai/memori-react/commit/04a963c4bab72d613bbee4a0d7af01715ec1b0e0))
 ## [7.6.1](https://github.com/memori-ai/memori-react/compare/v7.6.0...v7.6.1) (2024-10-11)
 ### Bug Fixes
 * added 'memori-' to all of hidden chat classes ([adebe23](https://github.com/memori-ai/memori-react/commit/adebe23427d249be67b9ee138f32dcaa312af672))
+* added DateSelector inside the Jest ignore patterns ([92787c6](https://github.com/memori-ai/memori-react/commit/92787c6db38d88fb5f5ff56dca732e2bf29c7a40))
 ## [7.6.0](https://github.com/memori-ai/memori-react/compare/v7.5.1...v7.6.0) (2024-10-11)

package/dist/components/AttachmentMediaModal/AttachmentMediaModal.d.ts ADDED Viewed

@@ -0,0 +1,14 @@
+import { Asset, ResponseSpec } from '@memori.ai/memori-api-client/dist/types';
+export interface Props {
+    visible: boolean;
+    authToken: string;
+    sessionID: string;
+    tenantID: string;
+    uploadAssetURL: string;
+    deleteAsset: (token: string, assetURL: string) => Promise<ResponseSpec>;
+    onCancel?: () => void;
+    onOk: (asset: Asset) => Promise<void>;
+    apiURL?: string;
+}
+declare const AttachmentMediaModal: ({ visible, authToken, sessionID, tenantID, uploadAssetURL, deleteAsset, onCancel, onOk, apiURL, }: Props) => JSX.Element;
+export default AttachmentMediaModal;

package/dist/components/AttachmentMediaModal/AttachmentMediaModal.js ADDED Viewed

@@ -0,0 +1,66 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const jsx_runtime_1 = require("react/jsx-runtime");
+const react_1 = require("react");
+const react_i18next_1 = require("react-i18next");
+const error_1 = require("../../helpers/error");
+const constants_1 = require("../../helpers/constants");
+const media_1 = require("../../helpers/media");
+const Modal_1 = tslib_1.__importDefault(require("../ui/Modal"));
+const Message_1 = tslib_1.__importDefault(require("../ui/Message"));
+const Button_1 = tslib_1.__importDefault(require("../ui/Button"));
+const ImageUpload_1 = tslib_1.__importDefault(require("../ImageUpload/ImageUpload"));
+const AttachmentMediaModal = ({ visible, authToken, sessionID, tenantID, uploadAssetURL, deleteAsset, onCancel, onOk, apiURL, }) => {
+    const { t } = (0, react_i18next_1.useTranslation)();
+    const [asset, setAsset] = (0, react_1.useState)();
+    return ((0, jsx_runtime_1.jsx)(Modal_1.default, { open: visible, title: t('media.addMediaLabel'), className: "attachment-media-modal", closable: true, width: "100%", widthMd: "100%", onClose: () => {
+            if (onCancel)
+                onCancel();
+        }, footer: (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(Button_1.default, { onClick: onCancel, children: t('cancel') }), (0, jsx_runtime_1.jsx)(Button_1.default, { primary: true, onClick: () => {
+                        if (asset)
+                            onOk(asset);
+                        setAsset(undefined);
+                    }, disabled: !asset, children: t('confirm') })] }), children: (0, jsx_runtime_1.jsx)(ImageUpload_1.default, { tenantID: tenantID, apiUrl: apiURL, uploadMultipleImages: false, maxNumberOfVisualizedUploads: 1, maxFileSizeInMB: 100, uploadUrl: uploadAssetURL, useImageCrop: false, allowedMimeTypes: constants_1.allowedMediaTypes, fileList: asset
+                ? [
+                    {
+                        uid: `-1`,
+                        name: asset.assetID,
+                        status: 'done',
+                        thumbUrl: (0, media_1.getResourceUrl)({
+                            resourceURI: asset.assetURL,
+                            tenantID,
+                            apiURL,
+                            sessionID,
+                        }),
+                    },
+                ]
+                : [], uploadMessage: t('media.mediaUploadMessage'), imageProportions: 1, onUploadFinished: (file) => {
+                let newAsset = file.response.asset;
+                let response = file.response;
+                if (response.resultCode === 0) {
+                    setAsset(newAsset);
+                }
+                else {
+                    console.error(response, file);
+                    Message_1.default.error(t((0, error_1.getErrori18nKey)(response.resultCode)));
+                }
+            }, onFileChanged: (_assetID, asset) => {
+                setAsset(a => ({
+                    ...(a || {}),
+                    ...asset,
+                }));
+            }, onRemove: async (file) => {
+                const resp = await deleteAsset(authToken, file.thumbUrl);
+                if (resp.resultCode === 0) {
+                    setAsset(undefined);
+                }
+                else {
+                    console.error(resp, file);
+                    Message_1.default.error(t((0, error_1.getErrori18nKey)(resp.resultCode)));
+                }
+                return resp.resultCode === 0;
+            } }) }));
+};
+exports.default = AttachmentMediaModal;
+//# sourceMappingURL=AttachmentMediaModal.js.map

package/dist/components/AttachmentMediaModal/AttachmentMediaModal.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"AttachmentMediaModal.js","sourceRoot":"","sources":["../../../src/components/AttachmentMediaModal/AttachmentMediaModal.tsx"],"names":[],"mappings":"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"}

package/dist/components/Avatar/Avatar.js CHANGED Viewed

@@ -19,7 +19,7 @@ const visemeContext_1 = require("../../context/visemeContext");
 const Avatar = ({ memori, integration, integrationConfig, tenant, instruct = false, avatar3dVisible = false, setAvatar3dVisible, hasUserActivatedSpeak = false, isPlayingAudio = false, loading = false, baseUrl, apiUrl, animation, isZoomed = false, chatProps, }) => {
     const { t } = (0, react_i18next_1.useTranslation)();
     const [isClient, setIsClient] = (0, react_1.useState)(false);
-    const { setMeshRef, clearVisemes, setEmotion } = (0, visemeContext_1.useViseme)();
+    const { updateCurrentViseme } = (0, visemeContext_1.useViseme)();
     (0, react_1.useEffect)(() => {
         setIsClient(true);
     }, []);
@@ -56,7 +56,7 @@ const Avatar = ({ memori, integration, integrationConfig, tenant, instruct = fal
         if ((integrationConfig === null || integrationConfig === void 0 ? void 0 : integrationConfig.avatar) === 'readyplayerme' ||
             (integrationConfig === null || integrationConfig === void 0 ? void 0 : integrationConfig.avatar) === 'readyplayerme-full' ||
             (integrationConfig === null || integrationConfig === void 0 ? void 0 : integrationConfig.avatar) === 'customrpm') {
-            return ((0, jsx_runtime_1.jsx)(ErrorBoundary_1.default, { fallback: (0, jsx_runtime_1.jsx)("div", { className: "memori--blob-container", children: isClient && ((0, jsx_runtime_1.jsx)(Blob_1.default, { speaking: isPlayingAudio, avatar: getAvatarUrl() })) }), children: (0, jsx_runtime_1.jsx)(AvatarView_1.default, { url: integrationConfig.avatarURL, sex: memori.voiceType === 'FEMALE' ? 'FEMALE' : 'MALE', fallbackImg: getAvatarUrl(), headMovement: true, eyeBlink: true, animation: animation, halfBody: integrationConfig.avatar === 'readyplayerme', speaking: isPlayingAudio, loading: loading, style: getAvatarStyle(), clearVisemes: clearVisemes, setMeshRef: setMeshRef, isZoomed: isZoomed, chatEmission: (_a = chatProps === null || chatProps === void 0 ? void 0 : chatProps.dialogState) === null || _a === void 0 ? void 0 : _a.emission, setEmotion: setEmotion }) }));
+            return ((0, jsx_runtime_1.jsx)(ErrorBoundary_1.default, { fallback: (0, jsx_runtime_1.jsx)("div", { className: "memori--blob-container", children: isClient && ((0, jsx_runtime_1.jsx)(Blob_1.default, { speaking: isPlayingAudio, avatar: getAvatarUrl() })) }), children: (0, jsx_runtime_1.jsx)(AvatarView_1.default, { updateCurrentViseme: updateCurrentViseme, url: integrationConfig.avatarURL, sex: memori.voiceType === 'FEMALE' ? 'FEMALE' : 'MALE', fallbackImg: getAvatarUrl(), headMovement: true, eyeBlink: true, animation: animation, halfBody: integrationConfig.avatar === 'readyplayerme', speaking: isPlayingAudio, loading: loading, style: getAvatarStyle(), isZoomed: isZoomed, chatEmission: (_a = chatProps === null || chatProps === void 0 ? void 0 : chatProps.dialogState) === null || _a === void 0 ? void 0 : _a.emission }) }));
         }
         if ((integrationConfig === null || integrationConfig === void 0 ? void 0 : integrationConfig.avatar) === 'customglb') {
             return ((0, jsx_runtime_1.jsx)(ModelViewer_1.default, { poster: getAvatarUrl() || '', src: integrationConfig.avatarURL, alt: "" }));

package/dist/components/Avatar/Avatar.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Avatar.js","sourceRoot":"","sources":["../../../src/components/Avatar/Avatar.tsx"],"names":[],"mappings":";;;;AAAA,iCAAyD;AAMzD,2FAA2D;AAC3D,oEAAoC;AACpC,+CAAqD;AACrD,gEAAgC;AAChC,8FAA8D;AAC9D,kEAAkC;AAClC,iDAA+C;AAC/C,+DAA+B;AAC/B,iFAAiD;AACjD,iEAAiC;AACjC,oEAA4B;AAC5B,sEAA+C;AAC/C,+DAAwD;AAoBxD,MAAM,MAAM,GAAoB,CAAC,EAC/B,MAAM,EACN,WAAW,EACX,iBAAiB,EACjB,MAAM,EACN,QAAQ,GAAG,KAAK,EAChB,eAAe,GAAG,KAAK,EACvB,kBAAkB,EAClB,qBAAqB,GAAG,KAAK,EAC7B,cAAc,GAAG,KAAK,EACtB,OAAO,GAAG,KAAK,EACf,OAAO,EACP,MAAM,EACN,SAAS,EACT,QAAQ,GAAG,KAAK,EAChB,SAAS,GACV,EAAE,EAAE;IAEH,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,8BAAc,GAAE,CAAC;IAC/B,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAC;IAEhD,MAAM,~~EAAE~~,~~UAAU~~,EAAE,~~YAAY,EAAE,UAAU,EAAE,~~GAAG,IAAA,yBAAS,GAAE,CAAC;~~IAE7D~~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~~YAAY,EAAE,YAAY,EAC1B,UAAU,EAAE,UAAU,EACtB,~~QAAQ,EAAE,QAAQ,EAClB,YAAY,EAAE,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,WAAW,0CAAE,QAAQ,~~EAC9C~~,~~UAAU,EAAE,UAAU,GACtB,~~GACY,CACjB,CAAC;SACH;QAED,IAAI,CAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,MAAM,MAAK,WAAW,EAAE;YAC7C,OAAO,CACL,uBAAC,qBAAW,IACV,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,EAC5B,GAAG,EAAE,iBAAiB,CAAC,SAAS,EAChC,GAAG,EAAC,EAAE,GACN,CACH,CAAC;SACH;QAED,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IAGF,MAAM,kBAAkB,GAAG,GAAG,EAAE,CAAC,CAC/B,gCAAK,SAAS,EAAC,uBAAuB,YACpC,uBAAC,gBAAM,IACL,KAAK,QACL,OAAO,EAAE,GAAG,EAAE,CAAC,kBAAkB,CAAC,CAAC,eAAe,CAAC,EACnD,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC,uBAAC,sBAAY,KAAG,CAAC,CAAC,CAAC,uBAAC,aAAG,KAAG,YAElD,iCAAM,SAAS,EAAC,4BAA4B,YACzC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GACnC,GACA,GACL,CACP,CAAC;IAEF,MAAM,cAAc,GAAG,GAAG,EAAE;QAC1B,IAAI,CAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,MAAM,MAAK,eAAe,EAAE;YACjD,OAAO;gBACL,KAAK,EAAE,OAAO;gBACd,MAAM,EAAE,OAAO;gBACf,eAAe,EAAE,MAAM;gBACvB,YAAY,EAAE,MAAM;gBACpB,SAAS,EAAE,MAAM;aAClB,CAAC;SACH;QACD,OAAO;YACL,KAAK,EAAE,MAAM;YACb,MAAM,EAAE,MAAM;YACd,eAAe,EAAE,MAAM;SACxB,CAAC;IACJ,CAAC,CAAC;IAEF,MAAM,sBAAsB,GAAG,GAAG,EAAE;QAClC,IAAI,CAAC,CAAC,QAAQ,IAAI,CAAC,qBAAqB,IAAI,MAAM,CAAC,OAAO,KAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,EAAE,CAAA,CAAC;YACvE,OAAO,IAAI,CAAC;QAEd,MAAM,IAAI,GAAG,WAAW,MAAM,CAAC,EAAE,IAC/B,MAAM,CAAC,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IACtC,IAAI,MAAM,CAAC,aAAa,IAAI,MAAM,CAAC,IAAI,gBACrC,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,aAAa;YACxB,CAAC,CAAC,gBAAgB,WAAW,CAAC,aAAa,uBAAuB;YAClE,CAAC,CAAC,EACN,EAAE,CAAC;QAEH,OAAO,CACL,gCAAK,SAAS,EAAC,qCAAqC,YAClD,8BACE,SAAS,EAAC,6DAA6D,EACvE,IAAI,EAAE,IAAI,YAEV,uBAAC,iBAAO,IAAC,OAAO,EAAE,CAAC,CAAC,yCAAyC,CAAC,YAC5D,iCAAM,SAAS,EAAC,qBAAqB,YACnC,uBAAC,cAAI,KAAG,GACH,GACC,GACR,GACA,CACP,CAAC;IACJ,CAAC,CAAC;IAEF,OAAO,CACL,6DACG,YAAY,EAAE,EACd,sBAAsB,EAAE,IACxB,CACJ,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,IAAA,YAAI,EAAC,MAAM,EAAE,CAAC,SAAS,EAAE,SAAS,EAAE,EAAE;IACnD,OAAO,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;AACjE,CAAC,CAAC,CAAC"}
1	+ {"version":3,"file":"Avatar.js","sourceRoot":"","sources":["../../../src/components/Avatar/Avatar.tsx"],"names":[],"mappings":";;;;AAAA,iCAAyD;AAMzD,2FAA2D;AAC3D,oEAAoC;AACpC,+CAAqD;AACrD,gEAAgC;AAChC,8FAA8D;AAC9D,kEAAkC;AAClC,iDAA+C;AAC/C,+DAA+B;AAC/B,iFAAiD;AACjD,iEAAiC;AACjC,oEAA4B;AAC5B,sEAA+C;AAC/C,+DAAwD;AAoBxD,MAAM,MAAM,GAAoB,CAAC,EAC/B,MAAM,EACN,WAAW,EACX,iBAAiB,EACjB,MAAM,EACN,QAAQ,GAAG,KAAK,EAChB,eAAe,GAAG,KAAK,EACvB,kBAAkB,EAClB,qBAAqB,GAAG,KAAK,EAC7B,cAAc,GAAG,KAAK,EACtB,OAAO,GAAG,KAAK,EACf,OAAO,EACP,MAAM,EACN,SAAS,EACT,QAAQ,GAAG,KAAK,EAChB,SAAS,GACV,EAAE,EAAE;IAEH,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,8BAAc,GAAE,CAAC;IAC/B,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAC;IAEhD,MAAM,EAAG,mBAAmB,EAAE,GAAG,IAAA,yBAAS,GAAE,CAAC;IAE7C,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,WAAW,CAAC,IAAI,CAAC,CAAC;IACpB,CAAC,EAAE,EAAE,CAAC,CAAC;IAGP,MAAM,YAAY,GAAG,GAAG,EAAE;QACxB,IACE,CAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,MAAM,MAAK,YAAY;YAC1C,MAAM,CAAC,SAAS;YAChB,MAAM,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAC3B;YACA,OAAO,IAAA,sBAAc,EAAC;gBACpB,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,EAAE;gBACpB,WAAW,EAAE,MAAM,CAAC,SAAS;gBAC7B,OAAO,EAAE,OAAO;gBAChB,MAAM,EAAE,MAAM;aACf,CAAC,CAAC;SACJ;QACD,OAAO,SAAS,CAAC;IACnB,CAAC,CAAC;IAEF,MAAM,YAAY,GAAG,GAAG,EAAE;QACxB,IACE,CAAC,CAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,MAAM,MAAK,eAAe;YAC5C,CAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,MAAM,MAAK,oBAAoB;YAClD,CAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,MAAM,MAAK,WAAW;YACzC,CAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,MAAM,MAAK,WAAW,CAAC;aAC5C,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,SAAS,CAAA,EAC5B;YACA,OAAO,CACL,6DACE,gCACE,SAAS,EAAE,IAAA,oBAAE,EACX,wBAAwB,EACxB,kBAAkB,CAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,MAAM,KAAI,SAAS,EAAE,EAC1D;4BACE,MAAM,EAAE,CAAC,eAAe;yBACzB,CACF,YAEA,mBAAmB,EAAE,GAClB,EACL,kBAAkB,EAAE,IACpB,CACJ,CAAC;SACH;QACD,OAAO,CACL,gCAAK,SAAS,EAAC,wBAAwB,YACpC,QAAQ,IAAI,uBAAC,cAAI,IAAC,QAAQ,EAAE,cAAc,EAAE,MAAM,EAAE,YAAY,EAAE,GAAI,GACnE,CACP,CAAC;IACJ,CAAC,CAAC;IAEF,MAAM,mBAAmB,GAAG,GAAG,EAAE;;QAC/B,IAAI,CAAC,QAAQ;YAAE,OAAO,IAAI,CAAC;QAE3B,IACE,CAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,MAAM,MAAK,eAAe;YAC7C,CAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,MAAM,MAAK,oBAAoB;YAClD,CAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,MAAM,MAAK,WAAW,EACzC;YACA,OAAO,CACL,uBAAC,uBAAa,IACZ,QAAQ,EACN,gCAAK,SAAS,EAAC,wBAAwB,YACpC,QAAQ,IAAI,CACX,uBAAC,cAAI,IAAC,QAAQ,EAAE,cAAc,EAAE,MAAM,EAAE,YAAY,EAAE,GAAI,CAC3D,GACG,YAGR,uBAAC,oBAAmB,IAClB,mBAAmB,EAAE,mBAAmB,EACxC,GAAG,EAAE,iBAAiB,CAAC,SAAS,EAChC,GAAG,EAAE,MAAM,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EACtD,WAAW,EAAE,YAAY,EAAE,EAC3B,YAAY,QACZ,QAAQ,QACR,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,iBAAiB,CAAC,MAAM,KAAK,eAAe,EACtD,QAAQ,EAAE,cAAc,EACxB,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,cAAc,EAAE,EACvB,QAAQ,EAAE,QAAQ,EAClB,YAAY,EAAE,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,WAAW,0CAAE,QAAQ,GAC9C,GACY,CACjB,CAAC;SACH;QAED,IAAI,CAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,MAAM,MAAK,WAAW,EAAE;YAC7C,OAAO,CACL,uBAAC,qBAAW,IACV,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,EAC5B,GAAG,EAAE,iBAAiB,CAAC,SAAS,EAChC,GAAG,EAAC,EAAE,GACN,CACH,CAAC;SACH;QAED,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IAGF,MAAM,kBAAkB,GAAG,GAAG,EAAE,CAAC,CAC/B,gCAAK,SAAS,EAAC,uBAAuB,YACpC,uBAAC,gBAAM,IACL,KAAK,QACL,OAAO,EAAE,GAAG,EAAE,CAAC,kBAAkB,CAAC,CAAC,eAAe,CAAC,EACnD,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC,uBAAC,sBAAY,KAAG,CAAC,CAAC,CAAC,uBAAC,aAAG,KAAG,YAElD,iCAAM,SAAS,EAAC,4BAA4B,YACzC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GACnC,GACA,GACL,CACP,CAAC;IAEF,MAAM,cAAc,GAAG,GAAG,EAAE;QAC1B,IAAI,CAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,MAAM,MAAK,eAAe,EAAE;YACjD,OAAO;gBACL,KAAK,EAAE,OAAO;gBACd,MAAM,EAAE,OAAO;gBACf,eAAe,EAAE,MAAM;gBACvB,YAAY,EAAE,MAAM;gBACpB,SAAS,EAAE,MAAM;aAClB,CAAC;SACH;QACD,OAAO;YACL,KAAK,EAAE,MAAM;YACb,MAAM,EAAE,MAAM;YACd,eAAe,EAAE,MAAM;SACxB,CAAC;IACJ,CAAC,CAAC;IAEF,MAAM,sBAAsB,GAAG,GAAG,EAAE;QAClC,IAAI,CAAC,CAAC,QAAQ,IAAI,CAAC,qBAAqB,IAAI,MAAM,CAAC,OAAO,KAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,EAAE,CAAA,CAAC;YACvE,OAAO,IAAI,CAAC;QAEd,MAAM,IAAI,GAAG,WAAW,MAAM,CAAC,EAAE,IAC/B,MAAM,CAAC,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IACtC,IAAI,MAAM,CAAC,aAAa,IAAI,MAAM,CAAC,IAAI,gBACrC,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,aAAa;YACxB,CAAC,CAAC,gBAAgB,WAAW,CAAC,aAAa,uBAAuB;YAClE,CAAC,CAAC,EACN,EAAE,CAAC;QAEH,OAAO,CACL,gCAAK,SAAS,EAAC,qCAAqC,YAClD,8BACE,SAAS,EAAC,6DAA6D,EACvE,IAAI,EAAE,IAAI,YAEV,uBAAC,iBAAO,IAAC,OAAO,EAAE,CAAC,CAAC,yCAAyC,CAAC,YAC5D,iCAAM,SAAS,EAAC,qBAAqB,YACnC,uBAAC,cAAI,KAAG,GACH,GACC,GACR,GACA,CACP,CAAC;IACJ,CAAC,CAAC;IAEF,OAAO,CACL,6DACG,YAAY,EAAE,EACd,sBAAsB,EAAE,IACxB,CACJ,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,IAAA,YAAI,EAAC,MAAM,EAAE,CAAC,SAAS,EAAE,SAAS,EAAE,EAAE;IACnD,OAAO,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;AACjE,CAAC,CAAC,CAAC"}

package/dist/components/Avatar/AvatarView/AvatarComponent/avatarComponent.d.ts CHANGED Viewed

@@ -10,9 +10,10 @@ interface Props {
     speaking: boolean;
     isZoomed: boolean;
     chatEmission: any;
-    setMeshRef: any;
-    clearVisemes: () => void;
-    setEmotion: (emotion: string) => void;
+    updateCurrentViseme: (currentTime: number) => {
+        name: string;
+        weight: number;
+    } | null;
 }
 export declare const AvatarView: React.FC<Props & {
     halfBody: boolean;

package/dist/components/Avatar/AvatarView/AvatarComponent/avatarComponent.js CHANGED Viewed

@@ -32,13 +32,14 @@ const baseActions = {
     Loading2: { weight: 0 },
     Loading3: { weight: 0 },
 };
-const AvatarView = ({ setMeshRef, clearVisemes, chatEmission, showControls, animation, url, sex, eyeBlink, headMovement, speaking, halfBody, loading, isZoomed, setEmotion, }) => {
+const AvatarView = ({ chatEmission, showControls, animation, url, sex, eyeBlink, headMovement, speaking, halfBody, loading, isZoomed, updateCurrentViseme, }) => {
     const [currentBaseAction, setCurrentBaseAction] = (0, react_1.useState)({
         action: animation || 'Idle1',
         weight: 1,
     });
     const [morphTargetInfluences, setMorphTargetInfluences] = (0, react_1.useState)({});
     const [morphTargetDictionary, setMorphTargetDictionary] = (0, react_1.useState)({});
+    const [emotionMorphTargets, setEmotionMorphTargets] = (0, react_1.useState)({});
     const [timeScale, setTimeScale] = (0, react_1.useState)(0.8);
     const setEmotionMorphTargetInfluences = (0, react_1.useCallback)((action) => {
         const emotionMap = {
@@ -50,16 +51,14 @@ const AvatarView = ({ setMeshRef, clearVisemes, chatEmission, showControls, anim
             Loading: { Loading1: 1, Loading2: 1, Loading3: 1 },
         };
         const newEmotion = action.slice(0, -1);
-        setEmotion(newEmotion);
         const defaultEmotions = Object.keys(emotionMap).reduce((acc, key) => {
             acc[key] = 0;
             return acc;
         }, {});
         const emotion = Object.keys(emotionMap).find(key => action.startsWith(key)) || 'default';
         const emotionValues = emotion === 'default' ? defaultEmotions : emotionMap[emotion];
-        setMorphTargetInfluences(prevInfluences => ({
-            ...prevInfluences,
-            ...defaultEmotions,
+        setEmotionMorphTargets(prevEmotions => ({
+            ...prevEmotions,
             ...emotionValues,
         }));
     }, []);
@@ -93,6 +92,11 @@ const AvatarView = ({ setMeshRef, clearVisemes, chatEmission, showControls, anim
             const emotion = `${outputContent}${randomNumber}`;
             onBaseActionChange(emotion);
         }
+        else {
+            const randomNumber = Math.floor(Math.random() * 5) + 1;
+            const animation = `Idle${randomNumber === 3 ? 4 : randomNumber}`;
+            onBaseActionChange(animation);
+        }
     }, [chatEmission]);
     (0, react_1.useEffect)(() => {
         if (loading) {
@@ -101,7 +105,7 @@ const AvatarView = ({ setMeshRef, clearVisemes, chatEmission, showControls, anim
             onBaseActionChange(animation);
         }
     }, [loading]);
-    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [showControls && ((0, jsx_runtime_1.jsx)(controls_1.default, { timeScale: timeScale, morphTargetDictionary: morphTargetDictionary, onBaseActionChange: onBaseActionChange, onMorphTargetInfluencesChange: onMorphTargetInfluencesChange, onMorphTargetDictionaryChange: onMorphTargetDictionaryChange, baseActions: baseActions, currentBaseAction: currentBaseAction, modifyTimeScale: modifyTimeScale })), halfBody ? ((0, jsx_runtime_1.jsx)(halfbodyAvatar_1.default, { url: url, setMeshRef: setMeshRef, setMorphTargetInfluences: setMorphTargetInfluences, headMovement: headMovement, speaking: speaking, eyeBlink: eyeBlink, morphTargetInfluences: morphTargetInfluences, clearVisemes: clearVisemes, setMorphTargetDictionary: setMorphTargetDictionary })) : ((0, jsx_runtime_1.jsx)(fullbodyAvatar_1.default, { url: url, sex: sex, eyeBlink: eyeBlink, speaking: speaking, currentBaseAction: currentBaseAction, timeScale: timeScale, setMorphTargetInfluences: setMorphTargetInfluences, setMorphTargetDictionary: setMorphTargetDictionary, morphTargetInfluences: morphTargetInfluences, morphTargetDictionary: morphTargetDictionary, isZoomed: isZoomed, setMeshRef: setMeshRef, clearVisemes: clearVisemes }))] }));
+    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [showControls && ((0, jsx_runtime_1.jsx)(controls_1.default, { timeScale: timeScale, morphTargetDictionary: morphTargetDictionary, onBaseActionChange: onBaseActionChange, onMorphTargetInfluencesChange: onMorphTargetInfluencesChange, onMorphTargetDictionaryChange: onMorphTargetDictionaryChange, baseActions: baseActions, currentBaseAction: currentBaseAction, modifyTimeScale: modifyTimeScale })), halfBody ? ((0, jsx_runtime_1.jsx)(halfbodyAvatar_1.default, { url: url, headMovement: headMovement, speaking: speaking, eyeBlink: eyeBlink, morphTargetInfluences: morphTargetInfluences, setMorphTargetInfluences: setMorphTargetInfluences, setMorphTargetDictionary: setMorphTargetDictionary })) : ((0, jsx_runtime_1.jsx)(fullbodyAvatar_1.default, { url: url, sex: sex, eyeBlink: eyeBlink, currentBaseAction: currentBaseAction, timeScale: timeScale, morphTargetInfluences: morphTargetInfluences, isZoomed: isZoomed, updateCurrentViseme: updateCurrentViseme, setMorphTargetDictionary: setMorphTargetDictionary, setMorphTargetInfluences: setMorphTargetInfluences, emotionMorphTargets: emotionMorphTargets }))] }));
 };
 exports.AvatarView = AvatarView;
 //# sourceMappingURL=avatarComponent.js.map

package/dist/components/Avatar/AvatarView/AvatarComponent/avatarComponent.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"avatarComponent.js","sourceRoot":"","sources":["../../../../../src/components/Avatar/AvatarView/AvatarComponent/avatarComponent.tsx"],"names":[],"mappings":";;;;;AAAA,iCAAgE;AAChE,6EAA0D;AAC1D,yFAAyD;AACzD,yFAAyD;~~AAuBzD~~,MAAM,WAAW,GAA+B;IAC9C,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE;IACrB,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE;IACrB,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE;IACrB,KAAK,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE;IACpB,KAAK,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE;IACpB,KAAK,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE;IACpB,KAAK,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE;IACpB,KAAK,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE;IACpB,OAAO,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE;IACtB,OAAO,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE;IACtB,OAAO,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE;IACtB,SAAS,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE;IACxB,SAAS,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE;IACxB,SAAS,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE;IACxB,OAAO,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE;IACtB,OAAO,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE;IACtB,OAAO,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE;IACtB,UAAU,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE;IACzB,UAAU,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE;IACzB,UAAU,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE;IACzB,QAAQ,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE;IACvB,QAAQ,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE;IACvB,QAAQ,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE;CACxB,CAAC;~~AAEK~~,MAAM,UAAU,GAA4C,CAAC,EAClE,~~UAAU,EACV,~~YAAY,EACZ,YAAY,EACZ,~~YAAY,EACZ,~~SAAS,EACT,GAAG,EACH,GAAG,EACH,QAAQ,EACR,YAAY,EACZ,QAAQ,EACR,QAAQ,EACR,OAAO,EACP,QAAQ,EACR,~~UAAU~~,~~GACX~~,EAAE,EAAE;IACH,MAAM,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,GAAG,IAAA,gBAAQ,EAAC;QACzD,MAAM,EAAE,SAAS,IAAI,OAAO;QAC5B,MAAM,EAAE,CAAC;KACV,CAAC,CAAC;IAEH,MAAM,CAAC,qBAAqB,EAAE,wBAAwB,CAAC,GAAG,IAAA,gBAAQ,EAE/D,EAAE,CAAC,CAAC;IACP,MAAM,CAAC,qBAAqB,EAAE,wBAAwB,CAAC,GAAG,IAAA,gBAAQ,EAE/D,EAAE,CAAC,CAAC;IAEP,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,IAAA,gBAAQ,EAAC,GAAG,CAAC,CAAC;IAGhD,MAAM,+BAA+B,GAAG,IAAA,mBAAW,EAAC,CAAC,MAAc,EAAE,EAAE;QACrE,MAAM,UAAU,GAA2C;YACzD,KAAK,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE;YACpB,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE;YACrB,QAAQ,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE;YACzB,SAAS,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE;YAC3B,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE;YACrB,OAAO,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE;SACnD,CAAC;QAGF,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;~~QACvC~~,~~UAAU,CAAC,UAAU,CAAC,CAAC;QAEvB,~~MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YAClE,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACb,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,EAA4B,CAAC,CAAC;QAEjC,MAAM,OAAO,GACX,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,SAAS,CAAC;QAC3E,MAAM,aAAa,GACjB,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAEhE,~~wBAAwB~~,CAAC,~~cAAc~~,CAAC,EAAE,CAAC,CAAC;~~YAC1C~~,GAAG,~~cAAc~~;~~YACjB~~,GAAG,~~eAAe;YAClB,GAAG,~~aAAa;SACjB,CAAC,CAAC,CAAC;IACN,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,kBAAkB,GAAG,IAAA,mBAAW,EAAC,CAAC,MAAc,EAAE,EAAE;QACxD,+BAA+B,CAAC,MAAM,CAAC,CAAC;QACxC,oBAAoB,CAAC;YACnB,MAAM;YACN,MAAM,EAAE,CAAC;SACV,CAAC,CAAC;IACL,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,6BAA6B,GAAG,IAAA,mBAAW,EAC/C,CAAC,UAAqC,EAAE,EAAE;QACxC,wBAAwB,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;YAC1C,GAAG,cAAc;YACjB,GAAG,UAAU;SACd,CAAC,CAAC,CAAC;IACN,CAAC,EACD,EAAE,CACH,CAAC;IAEF,MAAM,6BAA6B,GAAG,IAAA,mBAAW,EAC/C,CAAC,UAAqC,EAAE,EAAE;QACxC,wBAAwB,CAAC,UAAU,CAAC,CAAC;IACvC,CAAC,EACD,EAAE,CACH,CAAC;IAEF,MAAM,eAAe,GAAG,IAAA,mBAAW,EAAC,CAAC,KAAa,EAAE,EAAE;QACpD,YAAY,CAAC,KAAK,CAAC,CAAC;IACtB,CAAC,EAAE,EAAE,CAAC,CAAC;IAGP,IAAA,iBAAS,EAAC,GAAG,EAAE;;QAEb,MAAM,YAAY,GAAG,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,QAAQ,CACzC,iCAAiC,CAClC,CAAC;QACF,MAAM,aAAa,GAAG,YAAY;YAChC,CAAC,CAAC,MAAA,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CACR,KAAK,CAAC,iCAAiC,EAAE,CAAC,CAAC,0CAC3C,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,0CACrB,IAAI,EAAE;YACZ,CAAC,CAAC,IAAI,CAAC;QAET,IAAI,aAAa,EAAE;YAIjB,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;YACvD,MAAM,OAAO,GAAG,GAAG,aAAa,GAAG,YAAY,EAAE,CAAC;YAElD,kBAAkB,CAAC,OAAO,CAAC,CAAC;SAC7B;IACH,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;IAEnB,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,OAAO,EAAE;YAEX,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;YACvD,MAAM,SAAS,GAAG,UAAU,YAAY,EAAE,CAAC;YAC3C,kBAAkB,CAAC,SAAS,CAAC,CAAC;SAC/B;IACH,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;~~IAEd~~,OAAO,CACL,6DACG,YAAY,IAAI,CACf,uBAAC,kBAAqB,IACpB,SAAS,EAAE,SAAS,EACpB,qBAAqB,EAAE,qBAAqB,EAC5C,kBAAkB,EAAE,kBAAkB,EACtC,6BAA6B,EAAE,6BAA6B,EAC5D,6BAA6B,EAAE,6BAA6B,EAC5D,WAAW,EAAE,WAAW,EACxB,iBAAiB,EAAE,iBAAiB,EACpC,eAAe,EAAE,eAAe,GAChC,CACH,EACA,QAAQ,CAAC,CAAC,CAAC,CACV,uBAAC,wBAAc,IACb,GAAG,EAAE,GAAG,EACR,~~UAAU,EAAE,UAAU,EACtB,wBAAwB,EAAE,wBAAwB,EAClD,~~YAAY,EAAE,YAAY,EAC1B,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,EAClB,qBAAqB,EAAE,qBAAqB,EAC5C,~~YAAY~~,EAAE,~~YAAY~~,~~EAC1B~~,wBAAwB,EAAE,wBAAwB,GAClD,CACH,CAAC,CAAC,CAAC,CACF,uBAAC,wBAAc,IACb,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,GAAG,EACR,QAAQ,EAAE,QAAQ,EAClB,~~QAAQ,EAAE,QAAQ,EAClB,~~iBAAiB,EAAE,iBAAiB,EACpC,SAAS,EAAE,SAAS,EACpB,~~wBAAwB~~,EAAE,~~wBAAwB~~,~~EAClD~~,~~wBAAwB~~,EAAE,~~wBAAwB~~,~~EAClD~~,~~qBAAqB~~,EAAE,~~qBAAqB~~,~~EAC5C~~,~~qBAAqB~~,EAAE,~~qBAAqB~~,~~EAC5C~~,~~QAAQ~~,EAAE,~~QAAQ~~,~~EAClB~~,~~UAAU~~,EAAE,~~UAAU~~,~~EACtB~~,~~YAAY,EAAE,YAAY,GAC1B,~~CACH,IACA,CACJ,CAAC;AACJ,CAAC,CAAC;~~AAzKW~~,QAAA,UAAU,~~cAyKrB~~"}
1	+ {"version":3,"file":"avatarComponent.js","sourceRoot":"","sources":["../../../../../src/components/Avatar/AvatarView/AvatarComponent/avatarComponent.tsx"],"names":[],"mappings":"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"}

package/dist/components/Avatar/AvatarView/AvatarComponent/components/fullbodyAvatar.d.ts CHANGED Viewed

@@ -7,24 +7,18 @@ interface FullbodyAvatarProps {
         weight: number;
     };
     timeScale: number;
-    loading?: boolean;
-    speaking?: boolean;
     isZoomed?: boolean;
-    setMorphTargetInfluences: (influences: {
-        [key: string]: number;
-    }) => void;
-    setMorphTargetDictionary: (dictionary: {
-        [key: string]: number;
-    }) => void;
-    morphTargetInfluences: {
-        [key: string]: number;
-    };
-    morphTargetDictionary: {
-        [key: string]: number;
-    };
-    setMeshRef: any;
     eyeBlink?: boolean;
-    clearVisemes: () => void;
+    updateCurrentViseme: (currentTime: number) => {
+        name: string;
+        weight: number;
+    } | null;
+    smoothMorphTarget?: boolean;
+    morphTargetSmoothing?: number;
+    morphTargetInfluences: Record<string, number>;
+    setMorphTargetDictionary: (morphTargetDictionary: Record<string, number>) => void;
+    setMorphTargetInfluences: (morphTargetInfluences: Record<string, number>) => void;
+    emotionMorphTargets: Record<string, number>;
 }
-export default function FullbodyAvatar({ url, sex, onLoaded, currentBaseAction, timeScale, isZoomed, setMorphTargetInfluences, setMorphTargetDictionary, morphTargetInfluences, eyeBlink, setMeshRef, clearVisemes, }: FullbodyAvatarProps): JSX.Element;
+export default function FullbodyAvatar({ url, sex, onLoaded, currentBaseAction, timeScale, isZoomed, eyeBlink, morphTargetSmoothing, updateCurrentViseme, setMorphTargetDictionary, setMorphTargetInfluences, emotionMorphTargets, }: FullbodyAvatarProps): JSX.Element;
 export {};

package/dist/components/Avatar/AvatarView/AvatarComponent/components/fullbodyAvatar.js CHANGED Viewed

@@ -6,75 +6,58 @@ const three_1 = require("three");
 const drei_1 = require("@react-three/drei");
 const fiber_1 = require("@react-three/fiber");
 const utils_1 = require("../../../../../helpers/utils");
-const useEyeBlink_1 = require("../../utils/useEyeBlink");
-const lerp = (start, end, alpha) => {
-    return start * (1 - alpha) + end * alpha;
-};
 const AVATAR_POSITION = new three_1.Vector3(0, -1, 0);
 const AVATAR_ROTATION = new three_1.Euler(0.175, 0, 0);
 const AVATAR_POSITION_ZOOMED = new three_1.Vector3(0, -1.45, 0);
 const ANIMATION_URLS = {
-    MALE: 'https://assets.memori.ai/api/v2/asset/1c350a21-97d8-4add-82cc-9dc10767a26b.glb',
-    FEMALE: 'https://assets.memori.ai/api/v2/asset/c2b07166-de10-4c66-918b-7b7cd380cca7.glb',
+    MALE: 'https://assets.memori.ai/api/v2/asset/2c5e88a4-cf62-408b-9ef0-518b099dfcb2.glb',
+    FEMALE: 'https://assets.memori.ai/api/v2/asset/0e49aa5d-f757-4292-a170-d843c2839a41.glb',
+};
+const BLINK_CONFIG = {
+    minInterval: 1000,
+    maxInterval: 5000,
+    blinkDuration: 150,
 };
-const ANIMATION_DURATION = 3000;
-function FullbodyAvatar({ url, sex, onLoaded, currentBaseAction, timeScale, isZoomed, setMorphTargetInfluences, setMorphTargetDictionary, morphTargetInfluences, eyeBlink, setMeshRef, clearVisemes, }) {
+const EMOTION_TRANSITION_SPEED = 0.1;
+function FullbodyAvatar({ url, sex, onLoaded, currentBaseAction, timeScale, isZoomed, eyeBlink, morphTargetSmoothing = 0.5, updateCurrentViseme, setMorphTargetDictionary, setMorphTargetInfluences, emotionMorphTargets, }) {
     const { scene } = (0, drei_1.useGLTF)(url);
     const { animations } = (0, drei_1.useGLTF)(ANIMATION_URLS[sex]);
     const { nodes, materials } = (0, fiber_1.useGraph)(scene);
     const { actions } = (0, drei_1.useAnimations)(animations, scene);
-    const [mixer] = (0, react_1.useState)(() => new three_1.AnimationMixer(scene));
-    const avatarMeshRef = (0, react_1.useRef)();
+    const mixer = (0, react_1.useRef)(new three_1.AnimationMixer(scene));
+    const headMeshRef = (0, react_1.useRef)();
     const currentActionRef = (0, react_1.useRef)(null);
-    const isTransitioningRef = (0, react_1.useRef)(false);
-    (0, useEyeBlink_1.useAvatarBlink)({
-        enabled: eyeBlink || false,
-        setMorphTargetInfluences,
-        config: {
-            minInterval: 1500,
-            maxInterval: 4000,
-            blinkDuration: 120,
-        },
-    });
-    const transitionToIdle = (0, react_1.useCallback)(() => {
-        if (!actions || isTransitioningRef.current)
-            return;
-        isTransitioningRef.current = true;
-        const finishCurrentAnimation = () => {
-            if (currentActionRef.current && !currentActionRef.current.paused) {
-                const remainingTime = (currentActionRef.current.getClip().duration - currentActionRef.current.time) * 1000;
-                setTimeout(() => {
-                    startIdleAnimation();
-                }, remainingTime);
-            }
-            else {
-                startIdleAnimation();
-            }
-        };
-        const startIdleAnimation = () => {
-            const idleAnimations = Object.keys(actions).filter(key => key.startsWith('Idle'));
-            const randomIdle = idleAnimations[Math.floor(Math.random() * idleAnimations.length)];
-            const idleAction = actions[randomIdle];
-            const fadeOutDuration = 0.5;
-            const fadeInDuration = 0.5;
-            if (currentActionRef.current) {
-                currentActionRef.current.fadeOut(fadeOutDuration);
+    const [isTransitioningToIdle, setIsTransitioningToIdle] = (0, react_1.useState)(false);
+    const lastBlinkTime = (0, react_1.useRef)(0);
+    const nextBlinkTime = (0, react_1.useRef)(0);
+    const isBlinking = (0, react_1.useRef)(false);
+    const blinkStartTime = (0, react_1.useRef)(0);
+    const currentEmotionRef = (0, react_1.useRef)({});
+    const previousEmotionKeysRef = (0, react_1.useRef)(new Set());
+    (0, react_1.useEffect)(() => {
+        (0, utils_1.correctMaterials)(materials);
+        scene.traverse((object) => {
+            if (object instanceof three_1.SkinnedMesh) {
+                if (object.name === 'GBNL__Head' || object.name === 'Wolf3D_Avatar') {
+                    headMeshRef.current = object;
+                    if (object.morphTargetDictionary && object.morphTargetInfluences) {
+                        setMorphTargetDictionary(object.morphTargetDictionary);
+                        const initialInfluences = Object.keys(object.morphTargetDictionary).reduce((acc, key) => ({ ...acc, [key]: 0 }), {});
+                        setMorphTargetInfluences(initialInfluences);
+                    }
+                }
             }
-            idleAction === null || idleAction === void 0 ? void 0 : idleAction.reset().fadeIn(fadeInDuration).play();
-            currentActionRef.current = idleAction;
-            setTimeout(() => {
-                isTransitioningRef.current = false;
-            }, (fadeOutDuration + fadeInDuration) * 1000);
+        });
+        onLoaded === null || onLoaded === void 0 ? void 0 : onLoaded();
+        return () => {
+            Object.values(materials).forEach(material => material.dispose());
+            Object.values(nodes)
+                .filter(utils_1.isSkinnedMesh)
+                .forEach(mesh => mesh.geometry.dispose());
         };
-        if (currentActionRef.current && !currentActionRef.current.getClip().name.startsWith('Idle')) {
-            finishCurrentAnimation();
-        }
-        else {
-            startIdleAnimation();
-        }
-    }, [actions]);
+    }, [materials, nodes, url, onLoaded, scene]);
     (0, react_1.useEffect)(() => {
-        if (!actions || !currentBaseAction.action || isTransitioningRef.current)
+        if (!actions || !currentBaseAction.action)
             return;
         const newAction = actions[currentBaseAction.action];
         if (!newAction) {
@@ -83,63 +66,104 @@ function FullbodyAvatar({ url, sex, onLoaded, currentBaseAction, timeScale, isZo
         }
         const fadeOutDuration = 0.8;
         const fadeInDuration = 0.8;
-        if (!currentBaseAction.action.startsWith('Idle')) {
-            setTimeout(() => {
-                transitionToIdle();
-            }, ANIMATION_DURATION);
-        }
         if (currentActionRef.current) {
             currentActionRef.current.fadeOut(fadeOutDuration);
         }
-        newAction.timeScale = timeScale;
+        console.log(newAction);
         newAction.reset().fadeIn(fadeInDuration).play();
         currentActionRef.current = newAction;
-    }, [currentBaseAction, timeScale, actions, transitionToIdle]);
-    (0, react_1.useEffect)(() => {
-        (0, utils_1.correctMaterials)(materials);
-        scene.traverse((object) => {
-            if (object instanceof three_1.SkinnedMesh &&
-                (object.name === 'GBNL__Head' || object.name === 'Wolf3D_Avatar')) {
-                avatarMeshRef.current = object;
-                setMeshRef(object);
-                if (object.morphTargetDictionary && object.morphTargetInfluences) {
-                    setMorphTargetDictionary(object.morphTargetDictionary);
-                    const initialInfluences = Object.keys(object.morphTargetDictionary).reduce((acc, key) => ({ ...acc, [key]: 0 }), {});
-                    setMorphTargetInfluences(initialInfluences);
+        newAction.timeScale = timeScale;
+        if (currentBaseAction.action.startsWith('Gioia') ||
+            currentBaseAction.action.startsWith('Rabbia') ||
+            currentBaseAction.action.startsWith('Sorpresa') ||
+            currentBaseAction.action.startsWith('Timore') ||
+            currentBaseAction.action.startsWith('Tristezza')) {
+            newAction.setLoop(three_1.LoopOnce, 1);
+            newAction.clampWhenFinished = true;
+            setIsTransitioningToIdle(true);
+        }
+    }, [actions, currentBaseAction, timeScale]);
+    (0, fiber_1.useFrame)(state => {
+        if (headMeshRef.current &&
+            headMeshRef.current.morphTargetDictionary &&
+            headMeshRef.current.morphTargetInfluences) {
+            const currentTime = state.clock.getElapsedTime() * 1000;
+            let blinkValue = 0;
+            if (eyeBlink) {
+                if (currentTime >= nextBlinkTime.current && !isBlinking.current) {
+                    isBlinking.current = true;
+                    blinkStartTime.current = currentTime;
+                    lastBlinkTime.current = currentTime;
+                    nextBlinkTime.current =
+                        currentTime +
+                            Math.random() *
+                                (BLINK_CONFIG.maxInterval - BLINK_CONFIG.minInterval) +
+                            BLINK_CONFIG.minInterval;
+                }
+                if (isBlinking.current) {
+                    const blinkProgress = (currentTime - blinkStartTime.current) / BLINK_CONFIG.blinkDuration;
+                    if (blinkProgress <= 0.5) {
+                        blinkValue = blinkProgress * 2;
+                    }
+                    else if (blinkProgress <= 1) {
+                        blinkValue = 2 - blinkProgress * 2;
+                    }
+                    else {
+                        isBlinking.current = false;
+                        blinkValue = 0;
+                    }
                 }
             }
-        });
-        onLoaded === null || onLoaded === void 0 ? void 0 : onLoaded();
-        return () => {
-            Object.values(materials).forEach(fiber_1.dispose);
-            Object.values(nodes).filter(utils_1.isSkinnedMesh).forEach(fiber_1.dispose);
-            clearVisemes();
-        };
-    }, [
-        materials,
-        nodes,
-        url,
-        onLoaded,
-        setMorphTargetDictionary,
-        setMorphTargetInfluences,
-        setMeshRef,
-        clearVisemes,
-    ]);
-    (0, fiber_1.useFrame)((_, delta) => {
-        if (avatarMeshRef.current && avatarMeshRef.current.morphTargetDictionary) {
-            updateMorphTargetInfluences();
-        }
-        mixer.update(delta * 0.001);
-        function updateMorphTargetInfluences() {
-            Object.entries(morphTargetInfluences).forEach(([key, value]) => {
-                const index = avatarMeshRef.current.morphTargetDictionary[key];
-                if (typeof index === 'number' &&
-                    avatarMeshRef.current.morphTargetInfluences) {
-                    const currentValue = avatarMeshRef.current.morphTargetInfluences[index];
-                    const smoothValue = lerp(currentValue, value, 0.1);
-                    avatarMeshRef.current.morphTargetInfluences[index] = smoothValue;
+            const currentViseme = updateCurrentViseme(currentTime / 1000);
+            const currentEmotionKeys = new Set(Object.keys(emotionMorphTargets));
+            previousEmotionKeysRef.current.forEach(key => {
+                if (!currentEmotionKeys.has(key)) {
+                    const index = headMeshRef.current.morphTargetDictionary[key];
+                    if (typeof index === 'number') {
+                        currentEmotionRef.current[key] = 0;
+                        if (headMeshRef.current && headMeshRef.current.morphTargetInfluences) {
+                            headMeshRef.current.morphTargetInfluences[index] = 0;
+                        }
+                    }
                 }
             });
+            Object.entries(headMeshRef.current.morphTargetDictionary).forEach(([key, index]) => {
+                if (typeof index === 'number') {
+                    let targetValue = 0;
+                    if (Object.prototype.hasOwnProperty.call(emotionMorphTargets, key)) {
+                        const targetEmotionValue = emotionMorphTargets[key];
+                        const currentEmotionValue = currentEmotionRef.current[key] || 0;
+                        const newEmotionValue = three_1.MathUtils.lerp(currentEmotionValue, targetEmotionValue * 2, EMOTION_TRANSITION_SPEED);
+                        currentEmotionRef.current[key] = newEmotionValue;
+                        targetValue += newEmotionValue;
+                    }
+                    if (currentViseme && key === currentViseme.name) {
+                        targetValue += currentViseme.weight * 1.2;
+                    }
+                    if (key === 'eyesClosed' && eyeBlink) {
+                        targetValue += blinkValue;
+                    }
+                    targetValue = three_1.MathUtils.clamp(targetValue, 0, 1);
+                    if (headMeshRef.current && headMeshRef.current.morphTargetInfluences) {
+                        headMeshRef.current.morphTargetInfluences[index] = three_1.MathUtils.lerp(headMeshRef.current.morphTargetInfluences[index], targetValue, morphTargetSmoothing);
+                    }
+                }
+            });
+            previousEmotionKeysRef.current = currentEmotionKeys;
+            if (isTransitioningToIdle && currentActionRef.current) {
+                if (currentActionRef.current.time >=
+                    currentActionRef.current.getClip().duration) {
+                    const idleNumber = Math.floor(Math.random() * 5) + 1;
+                    const idleAction = actions[`Idle${idleNumber == 3 ? 4 : idleNumber}`];
+                    if (idleAction) {
+                        currentActionRef.current.fadeOut(0.5);
+                        idleAction.reset().fadeIn(0.5).play();
+                        currentActionRef.current = idleAction;
+                        setIsTransitioningToIdle(false);
+                    }
+                }
+            }
+            mixer.current.update(0.01);
         }
     });
     return ((0, jsx_runtime_1.jsx)("group", { position: isZoomed ? AVATAR_POSITION_ZOOMED : AVATAR_POSITION, rotation: AVATAR_ROTATION, children: (0, jsx_runtime_1.jsx)("primitive", { object: scene }) }));