@memori.ai/memori-react 7.30.5 → 7.30.6
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.
- package/CHANGELOG.md +7 -0
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/fullbodyAvatar.js +33 -7
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/fullbodyAvatar.js.map +1 -1
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/fullbodyAvatar.js +33 -7
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/fullbodyAvatar.js.map +1 -1
- package/package.json +1 -1
- package/src/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/fullbodyAvatar.tsx +49 -12
- package/dist/components/ExportHistoryButton/ExportHistoryButton.d.ts +0 -14
- package/dist/components/ExportHistoryButton/ExportHistoryButton.js +0 -38
- package/dist/components/ExportHistoryButton/ExportHistoryButton.js.map +0 -1
- package/esm/components/ExportHistoryButton/ExportHistoryButton.d.ts +0 -14
- package/esm/components/ExportHistoryButton/ExportHistoryButton.js +0 -35
- package/esm/components/ExportHistoryButton/ExportHistoryButton.js.map +0 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,12 @@
|
|
|
1
1
|
|
|
2
2
|
|
|
3
|
+
## [7.30.6](https://github.com/memori-ai/memori-react/compare/v7.30.5...v7.30.6) (2025-06-24)
|
|
4
|
+
|
|
5
|
+
|
|
6
|
+
### Features
|
|
7
|
+
|
|
8
|
+
* enhance avatar detection logic for custom avatars with dynamic morph target checks ([ad8d6b8](https://github.com/memori-ai/memori-react/commit/ad8d6b8a437dd04b668b8fdc26b673f2e73e9c7d))
|
|
9
|
+
|
|
3
10
|
## [7.30.5](https://github.com/memori-ai/memori-react/compare/v7.30.4...v7.30.5) (2025-06-18)
|
|
4
11
|
|
|
5
12
|
|
|
@@ -48,16 +48,39 @@ function FullbodyAvatar({ url, sex, eyeBlink, updateCurrentViseme, avatarHeight
|
|
|
48
48
|
return;
|
|
49
49
|
let headMesh = null;
|
|
50
50
|
scene.traverse((object) => {
|
|
51
|
-
if (object instanceof three_1.SkinnedMesh
|
|
52
|
-
(object.name === '
|
|
53
|
-
object.name === 'Wolf3D_Avatar' ||
|
|
54
|
-
object.name === 'Wolf3D_Avatar006_1')) {
|
|
55
|
-
if (object.name === 'Wolf3D_Avatar' ||
|
|
56
|
-
object.name === 'Wolf3D_Avatar006_1') {
|
|
51
|
+
if (object instanceof three_1.SkinnedMesh) {
|
|
52
|
+
if (object.name === 'Wolf3D_Avatar' || object.name === 'Wolf3D_Avatar006_1') {
|
|
57
53
|
setIsRpm(true);
|
|
58
54
|
console.log('RPM avatar detected');
|
|
55
|
+
headMesh = object;
|
|
56
|
+
return;
|
|
57
|
+
}
|
|
58
|
+
if (object.name === 'GBNL__Head') {
|
|
59
|
+
headMesh = object;
|
|
60
|
+
}
|
|
61
|
+
else {
|
|
62
|
+
const hasMorphTargets = object.morphTargetDictionary &&
|
|
63
|
+
Object.keys(object.morphTargetDictionary).length > 0;
|
|
64
|
+
if (hasMorphTargets) {
|
|
65
|
+
const morphTargetNames = Object.keys(object.morphTargetDictionary || {});
|
|
66
|
+
const hasVisemes = morphTargetNames.some(name => name.toLowerCase().includes('viseme'));
|
|
67
|
+
const hasFaceBlendShapes = morphTargetNames.some(name => {
|
|
68
|
+
const lower = name.toLowerCase();
|
|
69
|
+
return lower.includes('mouth') ||
|
|
70
|
+
lower.includes('eye') ||
|
|
71
|
+
lower.includes('jaw') ||
|
|
72
|
+
lower.includes('smile');
|
|
73
|
+
});
|
|
74
|
+
if (hasVisemes || hasFaceBlendShapes) {
|
|
75
|
+
console.log('🎭 Custom avatar detected:', {
|
|
76
|
+
name: object.name,
|
|
77
|
+
morphTargets: morphTargetNames,
|
|
78
|
+
visemeCount: morphTargetNames.filter(name => name.toLowerCase().includes('viseme')).length
|
|
79
|
+
});
|
|
80
|
+
headMesh = object;
|
|
81
|
+
}
|
|
82
|
+
}
|
|
59
83
|
}
|
|
60
|
-
headMesh = object;
|
|
61
84
|
}
|
|
62
85
|
});
|
|
63
86
|
if (headMesh) {
|
|
@@ -65,6 +88,9 @@ function FullbodyAvatar({ url, sex, eyeBlink, updateCurrentViseme, avatarHeight
|
|
|
65
88
|
morphTargetControllerRef.current = new MorphTargetController_1.MorphTargetController(headMesh);
|
|
66
89
|
}
|
|
67
90
|
}
|
|
91
|
+
else {
|
|
92
|
+
console.warn('⚠️ No suitable avatar mesh found');
|
|
93
|
+
}
|
|
68
94
|
}, [scene]);
|
|
69
95
|
(0, react_1.useEffect)(() => {
|
|
70
96
|
if (!positionControllerRef.current) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fullbodyAvatar.js","sourceRoot":"","sources":["../../../../../../../src/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/fullbodyAvatar.tsx"],"names":[],"mappings":";;;;;AAAA,iCAA0E;AAC1E,iCAA+E;AAC/E,4CAA2D;AAC3D,8CAA8C;AAC9C,gFAA6E;AAC7E,sFAAmF;AACnF,kEAA+D;AAC/D,+CAKyB;AACzB,uFAAuD;AAmBvD,SAAgB,cAAc,CAAC,EAC7B,GAAG,EACH,GAAG,EACH,QAAQ,EACR,mBAAmB,EACnB,YAAY,GAAG,EAAE,EACjB,WAAW,GAAG,CAAC,EACf,eAAe,EACf,YAAY,EACZ,OAAO,EACP,cAAc,GACM;IAEpB,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,GAAG,IAAA,cAAO,EAAC,GAAG,CAAC,CAAC;IAG3D,MAAM,EAAE,UAAU,EAAE,oBAAoB,EAAE,GAAG,IAAA,cAAO,EAAC,0BAAc,CAAC,GAAG,CAAC,CAAC,CAAC;IAG1E,MAAM,yBAAyB,GAAG,IAAA,eAAO,EAAC,GAAG,EAAE;QAC7C,IAAI,KAAK,GAAG,KAAK,CAAC;QAClB,KAAK,CAAC,QAAQ,CAAC,CAAC,MAAgB,EAAE,EAAE;YAClC,IACE,MAAM,YAAY,mBAAW;gBAC7B,CAAC,MAAM,CAAC,IAAI,KAAK,YAAY;oBAC3B,MAAM,CAAC,IAAI,KAAK,eAAe;oBAC/B,MAAM,CAAC,IAAI,KAAK,oBAAoB,CAAC,EACvC;gBACA,KAAK,GAAG,IAAI,CAAC;aACd;QACH,CAAC,CAAC,CAAC;QACH,OAAO,KAAK,CAAC;IACf,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IAGZ,MAAM,gBAAgB,GAAG,IAAA,eAAO,EAC9B,GAAG,EAAE,CAAC,yBAAyB,CAAC,CAAC,CAAC,CAAC,GAAG,cAAc,EAAE,GAAG,oBAAoB,CAAC,CAAC,CAAC,CAAC,cAAc,EAC/F,CAAC,cAAc,EAAE,oBAAoB,EAAE,yBAAyB,CAAC,CAClE,CAAC;IAGF,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,oBAAa,EAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;IAG3D,MAAM,wBAAwB,GAAG,IAAA,cAAM,EAA+B,IAAI,CAAC,CAAC;IAC5E,MAAM,qBAAqB,GAAG,IAAA,cAAM,EAAkC,IAAI,CAAC,CAAC;IAC5E,MAAM,WAAW,GAAG,IAAA,cAAM,EAAwB,IAAI,CAAC,CAAC;IAGxD,MAAM,gBAAgB,GAAG,IAAA,cAAM,EAAU,KAAK,CAAC,CAAC;IAGhD,MAAM,eAAe,GAAG,IAAA,cAAM,EAAU,2BAAe,CAAC,KAAK,EAAE,CAAC,CAAC;IACjE,MAAM,yBAAyB,GAAG,IAAA,cAAM,EAAS,CAAC,CAAC,CAAC;IACpD,MAAM,wBAAwB,GAAG,CAAC,CAAC;IAGnC,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAC;IAG1C,MAAM,aAAa,GAAG,IAAA,cAAM,EAAC;QAC3B,UAAU,EAAE,KAAK;QACjB,aAAa,EAAE,CAAC;QAChB,aAAa,EAAE,CAAC;QAChB,cAAc,EAAE,CAAC;KAClB,CAAC,CAAC;IAGH,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,CAAC,KAAK;YAAE,OAAO;QAGnB,IAAI,QAAQ,GAAuB,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"fullbodyAvatar.js","sourceRoot":"","sources":["../../../../../../../src/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/fullbodyAvatar.tsx"],"names":[],"mappings":"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"}
|
package/esm/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/fullbodyAvatar.js
CHANGED
|
@@ -44,16 +44,39 @@ export function FullbodyAvatar({ url, sex, eyeBlink, updateCurrentViseme, avatar
|
|
|
44
44
|
return;
|
|
45
45
|
let headMesh = null;
|
|
46
46
|
scene.traverse((object) => {
|
|
47
|
-
if (object instanceof SkinnedMesh
|
|
48
|
-
(object.name === '
|
|
49
|
-
object.name === 'Wolf3D_Avatar' ||
|
|
50
|
-
object.name === 'Wolf3D_Avatar006_1')) {
|
|
51
|
-
if (object.name === 'Wolf3D_Avatar' ||
|
|
52
|
-
object.name === 'Wolf3D_Avatar006_1') {
|
|
47
|
+
if (object instanceof SkinnedMesh) {
|
|
48
|
+
if (object.name === 'Wolf3D_Avatar' || object.name === 'Wolf3D_Avatar006_1') {
|
|
53
49
|
setIsRpm(true);
|
|
54
50
|
console.log('RPM avatar detected');
|
|
51
|
+
headMesh = object;
|
|
52
|
+
return;
|
|
53
|
+
}
|
|
54
|
+
if (object.name === 'GBNL__Head') {
|
|
55
|
+
headMesh = object;
|
|
56
|
+
}
|
|
57
|
+
else {
|
|
58
|
+
const hasMorphTargets = object.morphTargetDictionary &&
|
|
59
|
+
Object.keys(object.morphTargetDictionary).length > 0;
|
|
60
|
+
if (hasMorphTargets) {
|
|
61
|
+
const morphTargetNames = Object.keys(object.morphTargetDictionary || {});
|
|
62
|
+
const hasVisemes = morphTargetNames.some(name => name.toLowerCase().includes('viseme'));
|
|
63
|
+
const hasFaceBlendShapes = morphTargetNames.some(name => {
|
|
64
|
+
const lower = name.toLowerCase();
|
|
65
|
+
return lower.includes('mouth') ||
|
|
66
|
+
lower.includes('eye') ||
|
|
67
|
+
lower.includes('jaw') ||
|
|
68
|
+
lower.includes('smile');
|
|
69
|
+
});
|
|
70
|
+
if (hasVisemes || hasFaceBlendShapes) {
|
|
71
|
+
console.log('🎭 Custom avatar detected:', {
|
|
72
|
+
name: object.name,
|
|
73
|
+
morphTargets: morphTargetNames,
|
|
74
|
+
visemeCount: morphTargetNames.filter(name => name.toLowerCase().includes('viseme')).length
|
|
75
|
+
});
|
|
76
|
+
headMesh = object;
|
|
77
|
+
}
|
|
78
|
+
}
|
|
55
79
|
}
|
|
56
|
-
headMesh = object;
|
|
57
80
|
}
|
|
58
81
|
});
|
|
59
82
|
if (headMesh) {
|
|
@@ -61,6 +84,9 @@ export function FullbodyAvatar({ url, sex, eyeBlink, updateCurrentViseme, avatar
|
|
|
61
84
|
morphTargetControllerRef.current = new MorphTargetController(headMesh);
|
|
62
85
|
}
|
|
63
86
|
}
|
|
87
|
+
else {
|
|
88
|
+
console.warn('⚠️ No suitable avatar mesh found');
|
|
89
|
+
}
|
|
64
90
|
}, [scene]);
|
|
65
91
|
useEffect(() => {
|
|
66
92
|
if (!positionControllerRef.current) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fullbodyAvatar.js","sourceRoot":"","sources":["../../../../../../../src/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/fullbodyAvatar.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"fullbodyAvatar.js","sourceRoot":"","sources":["../../../../../../../src/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/fullbodyAvatar.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -100,32 +100,69 @@ export function FullbodyAvatar({
|
|
|
100
100
|
// Find head mesh and initialize morph target controller - only run when scene changes
|
|
101
101
|
useEffect(() => {
|
|
102
102
|
if (!scene) return;
|
|
103
|
-
|
|
103
|
+
|
|
104
104
|
// Find head mesh
|
|
105
105
|
let headMesh: SkinnedMesh | null = null;
|
|
106
|
+
|
|
106
107
|
scene.traverse((object: Object3D) => {
|
|
107
|
-
if (
|
|
108
|
-
|
|
109
|
-
(object.name === '
|
|
110
|
-
object.name === 'Wolf3D_Avatar' ||
|
|
111
|
-
object.name === 'Wolf3D_Avatar006_1')
|
|
112
|
-
) {
|
|
113
|
-
|
|
114
|
-
if(object.name === 'Wolf3D_Avatar' ||
|
|
115
|
-
object.name === 'Wolf3D_Avatar006_1') {
|
|
108
|
+
if (object instanceof SkinnedMesh) {
|
|
109
|
+
// Keep existing RPM check
|
|
110
|
+
if (object.name === 'Wolf3D_Avatar' || object.name === 'Wolf3D_Avatar006_1') {
|
|
116
111
|
setIsRpm(true);
|
|
117
112
|
console.log('RPM avatar detected');
|
|
113
|
+
headMesh = object;
|
|
114
|
+
return; // Stop here if RPM found
|
|
115
|
+
}
|
|
116
|
+
|
|
117
|
+
// Dynamic detection for custom avatars
|
|
118
|
+
if (object.name === 'GBNL__Head') {
|
|
119
|
+
// Known custom avatar
|
|
120
|
+
headMesh = object;
|
|
121
|
+
} else {
|
|
122
|
+
// Dynamic detection for unknown custom avatars
|
|
123
|
+
const hasMorphTargets = object.morphTargetDictionary &&
|
|
124
|
+
Object.keys(object.morphTargetDictionary).length > 0;
|
|
125
|
+
|
|
126
|
+
if (hasMorphTargets) {
|
|
127
|
+
const morphTargetNames = Object.keys(object.morphTargetDictionary || {});
|
|
128
|
+
|
|
129
|
+
// Check if it has viseme-related morph targets (for custom avatars)
|
|
130
|
+
const hasVisemes = morphTargetNames.some(name =>
|
|
131
|
+
name.toLowerCase().includes('viseme')
|
|
132
|
+
);
|
|
133
|
+
|
|
134
|
+
// Check for other face-related blend shapes
|
|
135
|
+
const hasFaceBlendShapes = morphTargetNames.some(name => {
|
|
136
|
+
const lower = name.toLowerCase();
|
|
137
|
+
return lower.includes('mouth') ||
|
|
138
|
+
lower.includes('eye') ||
|
|
139
|
+
lower.includes('jaw') ||
|
|
140
|
+
lower.includes('smile');
|
|
141
|
+
});
|
|
142
|
+
|
|
143
|
+
if (hasVisemes || hasFaceBlendShapes) {
|
|
144
|
+
console.log('🎭 Custom avatar detected:', {
|
|
145
|
+
name: object.name,
|
|
146
|
+
morphTargets: morphTargetNames,
|
|
147
|
+
visemeCount: morphTargetNames.filter(name =>
|
|
148
|
+
name.toLowerCase().includes('viseme')).length
|
|
149
|
+
});
|
|
150
|
+
|
|
151
|
+
headMesh = object;
|
|
152
|
+
}
|
|
153
|
+
}
|
|
118
154
|
}
|
|
119
|
-
headMesh = object;
|
|
120
155
|
}
|
|
121
156
|
});
|
|
122
|
-
|
|
157
|
+
|
|
123
158
|
// Initialize morph target controller if head mesh found
|
|
124
159
|
if (headMesh) {
|
|
125
160
|
// Only create a new controller if one doesn't exist
|
|
126
161
|
if (!morphTargetControllerRef.current) {
|
|
127
162
|
morphTargetControllerRef.current = new MorphTargetController(headMesh);
|
|
128
163
|
}
|
|
164
|
+
} else {
|
|
165
|
+
console.warn('⚠️ No suitable avatar mesh found');
|
|
129
166
|
}
|
|
130
167
|
}, [scene]); // Only re-run if scene changes
|
|
131
168
|
|
|
@@ -1,14 +0,0 @@
|
|
|
1
|
-
import React from 'react';
|
|
2
|
-
import { Memori, Message } from '@memori.ai/memori-api-client/dist/types';
|
|
3
|
-
export interface Props {
|
|
4
|
-
history: Message[];
|
|
5
|
-
memori: Memori;
|
|
6
|
-
icon?: React.ReactNode;
|
|
7
|
-
className?: string;
|
|
8
|
-
buttonClassName?: string;
|
|
9
|
-
align?: 'left' | 'right';
|
|
10
|
-
disabled?: boolean;
|
|
11
|
-
filename?: string;
|
|
12
|
-
}
|
|
13
|
-
declare const ExportHistoryButton: ({ history, memori, className, buttonClassName, icon, disabled, align, filename, }: Props) => JSX.Element;
|
|
14
|
-
export default ExportHistoryButton;
|
|
@@ -1,38 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const tslib_1 = require("tslib");
|
|
4
|
-
const jsx_runtime_1 = require("react/jsx-runtime");
|
|
5
|
-
const react_i18next_1 = require("react-i18next");
|
|
6
|
-
const react_1 = require("@headlessui/react");
|
|
7
|
-
const Button_1 = tslib_1.__importDefault(require("../ui/Button"));
|
|
8
|
-
const Message_1 = tslib_1.__importDefault(require("../icons/Message"));
|
|
9
|
-
const classnames_1 = tslib_1.__importDefault(require("classnames"));
|
|
10
|
-
const downloadFile = (text, filename = 'export-chat.txt') => {
|
|
11
|
-
const data = new Blob([text], { type: 'text/plain' });
|
|
12
|
-
const url = URL.createObjectURL(data);
|
|
13
|
-
const element = document.createElement('a');
|
|
14
|
-
element.setAttribute('href', url);
|
|
15
|
-
element.setAttribute('download', filename);
|
|
16
|
-
element.style.display = 'none';
|
|
17
|
-
document.body.appendChild(element);
|
|
18
|
-
element.click();
|
|
19
|
-
document.body.removeChild(element);
|
|
20
|
-
};
|
|
21
|
-
const ExportHistoryButton = ({ history, memori, className, buttonClassName, icon, disabled = false, align = 'right', filename, }) => {
|
|
22
|
-
const { t } = (0, react_i18next_1.useTranslation)();
|
|
23
|
-
const text = `${t('write_and_speak.conversationStartedLabel')} ${new Intl.DateTimeFormat('it', {
|
|
24
|
-
dateStyle: 'short',
|
|
25
|
-
timeStyle: 'short',
|
|
26
|
-
}).format(new Date())}\n\n`.concat(history
|
|
27
|
-
.map(m => `${m.fromUser ? 'YOU' : memori.name}: ${m.text}`)
|
|
28
|
-
.join('\n'));
|
|
29
|
-
return ((0, jsx_runtime_1.jsx)(react_1.Popover, { title: t('write_and_speak.exportChatHistoryMessage'), className: (0, classnames_1.default)('memori-export-history-button', className, {
|
|
30
|
-
'memori-export-history-button--align-left': align === 'left',
|
|
31
|
-
}), children: ({ close }) => ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(react_1.Popover.Button, { disabled: disabled, className: (0, classnames_1.default)('memori-button', 'memori-button--circle', 'memori-button--icon-only', buttonClassName, {
|
|
32
|
-
'memori-button--disabled': disabled,
|
|
33
|
-
'memori-button--primary': !disabled,
|
|
34
|
-
}), children: (0, jsx_runtime_1.jsx)("div", { className: "memori-button--icon", children: icon || (0, jsx_runtime_1.jsx)(Message_1.default, {}) }) }), (0, jsx_runtime_1.jsxs)(react_1.Popover.Panel, { className: "memori-export-history-button--panel", children: [(0, jsx_runtime_1.jsx)("p", { children: t('write_and_speak.exportChatHistory') }), (0, jsx_runtime_1.jsx)(Button_1.default, { primary: true, onClick: () => downloadFile(text, filename ||
|
|
35
|
-
`${memori.name.replace(/\W+/g, '-')}-export-chat.txt`), children: t('yes') || 'Yes' }), (0, jsx_runtime_1.jsx)(Button_1.default, { onClick: () => close(), children: t('no') || 'No' })] })] })) }));
|
|
36
|
-
};
|
|
37
|
-
exports.default = ExportHistoryButton;
|
|
38
|
-
//# sourceMappingURL=ExportHistoryButton.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"ExportHistoryButton.js","sourceRoot":"","sources":["../../../src/components/ExportHistoryButton/ExportHistoryButton.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +0,0 @@
|
|
|
1
|
-
import React from 'react';
|
|
2
|
-
import { Memori, Message } from '@memori.ai/memori-api-client/dist/types';
|
|
3
|
-
export interface Props {
|
|
4
|
-
history: Message[];
|
|
5
|
-
memori: Memori;
|
|
6
|
-
icon?: React.ReactNode;
|
|
7
|
-
className?: string;
|
|
8
|
-
buttonClassName?: string;
|
|
9
|
-
align?: 'left' | 'right';
|
|
10
|
-
disabled?: boolean;
|
|
11
|
-
filename?: string;
|
|
12
|
-
}
|
|
13
|
-
declare const ExportHistoryButton: ({ history, memori, className, buttonClassName, icon, disabled, align, filename, }: Props) => JSX.Element;
|
|
14
|
-
export default ExportHistoryButton;
|
|
@@ -1,35 +0,0 @@
|
|
|
1
|
-
import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
|
|
2
|
-
import { useTranslation } from 'react-i18next';
|
|
3
|
-
import { Popover } from '@headlessui/react';
|
|
4
|
-
import Button from '../ui/Button';
|
|
5
|
-
import MessageIcon from '../icons/Message';
|
|
6
|
-
import cx from 'classnames';
|
|
7
|
-
const downloadFile = (text, filename = 'export-chat.txt') => {
|
|
8
|
-
const data = new Blob([text], { type: 'text/plain' });
|
|
9
|
-
const url = URL.createObjectURL(data);
|
|
10
|
-
const element = document.createElement('a');
|
|
11
|
-
element.setAttribute('href', url);
|
|
12
|
-
element.setAttribute('download', filename);
|
|
13
|
-
element.style.display = 'none';
|
|
14
|
-
document.body.appendChild(element);
|
|
15
|
-
element.click();
|
|
16
|
-
document.body.removeChild(element);
|
|
17
|
-
};
|
|
18
|
-
const ExportHistoryButton = ({ history, memori, className, buttonClassName, icon, disabled = false, align = 'right', filename, }) => {
|
|
19
|
-
const { t } = useTranslation();
|
|
20
|
-
const text = `${t('write_and_speak.conversationStartedLabel')} ${new Intl.DateTimeFormat('it', {
|
|
21
|
-
dateStyle: 'short',
|
|
22
|
-
timeStyle: 'short',
|
|
23
|
-
}).format(new Date())}\n\n`.concat(history
|
|
24
|
-
.map(m => `${m.fromUser ? 'YOU' : memori.name}: ${m.text}`)
|
|
25
|
-
.join('\n'));
|
|
26
|
-
return (_jsx(Popover, { title: t('write_and_speak.exportChatHistoryMessage'), className: cx('memori-export-history-button', className, {
|
|
27
|
-
'memori-export-history-button--align-left': align === 'left',
|
|
28
|
-
}), children: ({ close }) => (_jsxs(_Fragment, { children: [_jsx(Popover.Button, { disabled: disabled, className: cx('memori-button', 'memori-button--circle', 'memori-button--icon-only', buttonClassName, {
|
|
29
|
-
'memori-button--disabled': disabled,
|
|
30
|
-
'memori-button--primary': !disabled,
|
|
31
|
-
}), children: _jsx("div", { className: "memori-button--icon", children: icon || _jsx(MessageIcon, {}) }) }), _jsxs(Popover.Panel, { className: "memori-export-history-button--panel", children: [_jsx("p", { children: t('write_and_speak.exportChatHistory') }), _jsx(Button, { primary: true, onClick: () => downloadFile(text, filename ||
|
|
32
|
-
`${memori.name.replace(/\W+/g, '-')}-export-chat.txt`), children: t('yes') || 'Yes' }), _jsx(Button, { onClick: () => close(), children: t('no') || 'No' })] })] })) }));
|
|
33
|
-
};
|
|
34
|
-
export default ExportHistoryButton;
|
|
35
|
-
//# sourceMappingURL=ExportHistoryButton.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"ExportHistoryButton.js","sourceRoot":"","sources":["../../../src/components/ExportHistoryButton/ExportHistoryButton.tsx"],"names":[],"mappings":"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"}
|