one bug left 🪲
This commit is contained in:
parent
62b7074860
commit
2f94a5c546
6 changed files with 11 additions and 14 deletions
|
@ -8,7 +8,7 @@
|
||||||
"node": ">=14.6.0"
|
"node": ">=14.6.0"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"start": "webpack serve --config ./webpack.dev.js",
|
"start": "webpack serve --config ./webpack.dev.js --open",
|
||||||
"build": "webpack --config ./webpack.prod.js"
|
"build": "webpack --config ./webpack.prod.js"
|
||||||
},
|
},
|
||||||
"keywords": [],
|
"keywords": [],
|
||||||
|
|
|
@ -80,9 +80,9 @@ function AttachmentFrame({
|
||||||
}
|
}
|
||||||
|
|
||||||
AttachmentFrame.propTypes = {
|
AttachmentFrame.propTypes = {
|
||||||
attachmentOrUi: PropTypes.node.isRequired,
|
attachmentOrUi: PropTypes.oneOfType([PropTypes.string, PropTypes.object]).isRequired,
|
||||||
fileSetter: PropTypes.func.isRequired,
|
fileSetter: PropTypes.func.isRequired,
|
||||||
uploadProgressRef: PropTypes.node.isRequired,
|
uploadProgressRef: PropTypes.shape().isRequired,
|
||||||
cancelNeedle: PropTypes.func.isRequired,
|
cancelNeedle: PropTypes.func.isRequired,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -45,6 +45,8 @@ function pauseRec() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
function startOrResumeRec() {
|
function startOrResumeRec() {
|
||||||
|
if (!_mediaRecorder) return;
|
||||||
|
|
||||||
if (_mediaRecorder.state === 'paused') {
|
if (_mediaRecorder.state === 'paused') {
|
||||||
_mediaRecorder.resume();
|
_mediaRecorder.resume();
|
||||||
console.log('resume');
|
console.log('resume');
|
||||||
|
@ -58,9 +60,8 @@ function restartRec() {
|
||||||
if (_mediaRecorder.state !== 'inactive') _mediaRecorder.stop();
|
if (_mediaRecorder.state !== 'inactive') _mediaRecorder.stop();
|
||||||
|
|
||||||
_mediaRecorder = null;
|
_mediaRecorder = null;
|
||||||
init();
|
init()
|
||||||
|
.then(startOrResumeRec());
|
||||||
startOrResumeRec();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: Handle turning off the recorder to remove the browser indicator
|
// TODO: Handle turning off the recorder to remove the browser indicator
|
||||||
|
@ -106,7 +107,7 @@ function VoiceMailRecorder({ fnCancel, fnRequestResult, fnHowToSubmit }) {
|
||||||
<div className="room-attachment__preview">
|
<div className="room-attachment__preview">
|
||||||
<RawIcon src={VolumeFullIC} />
|
<RawIcon src={VolumeFullIC} />
|
||||||
</div>
|
</div>
|
||||||
<div className="room-attachment__info">
|
<div className="room-attachment__info room-attachment-ui-recorder">
|
||||||
<div>
|
<div>
|
||||||
<Text variant="b1">
|
<Text variant="b1">
|
||||||
{state}
|
{state}
|
||||||
|
@ -117,7 +118,7 @@ function VoiceMailRecorder({ fnCancel, fnRequestResult, fnHowToSubmit }) {
|
||||||
? (<IconButton onClick={pauseRec} src={PauseIC}>Pause</IconButton>)
|
? (<IconButton onClick={pauseRec} src={PauseIC}>Pause</IconButton>)
|
||||||
: (<IconButton onClick={startOrResumeRec} src={PlayIC}>Start</IconButton>)}
|
: (<IconButton onClick={startOrResumeRec} src={PlayIC}>Start</IconButton>)}
|
||||||
<IconButton onClick={restartRec} src={ArrowIC} tooltip="Start over">Reset</IconButton>
|
<IconButton onClick={restartRec} src={ArrowIC} tooltip="Start over">Reset</IconButton>
|
||||||
<IconButton onClick={() => stopAndSubmit()} src={ChevronBottomIC} type="Add as attachment">Submit</IconButton>
|
<IconButton onClick={() => stopAndSubmit()} src={ChevronBottomIC} tooltip="Add as attachment" type="submit">Submit</IconButton>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
@use '../../../partials/flex';
|
|
||||||
|
|
||||||
.room-attachment__info {
|
.room-attachment-ui-recorder {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|
||||||
div {
|
div {
|
||||||
|
|
|
@ -328,7 +328,6 @@ function RoomViewInput({
|
||||||
<>
|
<>
|
||||||
<div className={`room-input__option-container${attachmentOrUi === null ? '' : ' room-attachment__option'}`}>
|
<div className={`room-input__option-container${attachmentOrUi === null ? '' : ' room-attachment__option'}`}>
|
||||||
<AttachmentTypeSelector
|
<AttachmentTypeSelector
|
||||||
ref={uploadInputRef}
|
|
||||||
actOnAttaching={handleAttachmentTypeSelectorReturn}
|
actOnAttaching={handleAttachmentTypeSelectorReturn}
|
||||||
alreadyHasAttachment={attachmentOrUi !== null}
|
alreadyHasAttachment={attachmentOrUi !== null}
|
||||||
/>
|
/>
|
||||||
|
|
|
@ -216,7 +216,6 @@ class RoomsInput extends EventEmitter {
|
||||||
}
|
}
|
||||||
|
|
||||||
setAttachment(roomId, file) {
|
setAttachment(roomId, file) {
|
||||||
console.log(file);
|
|
||||||
const input = this.getInput(roomId);
|
const input = this.getInput(roomId);
|
||||||
input.attachment = {
|
input.attachment = {
|
||||||
file,
|
file,
|
||||||
|
@ -288,7 +287,6 @@ class RoomsInput extends EventEmitter {
|
||||||
|
|
||||||
async sendFile(roomId, file) {
|
async sendFile(roomId, file) {
|
||||||
const fileType = file.type.slice(0, file.type.indexOf('/'));
|
const fileType = file.type.slice(0, file.type.indexOf('/'));
|
||||||
console.log(file.type);
|
|
||||||
const info = {
|
const info = {
|
||||||
mimetype: file.type,
|
mimetype: file.type,
|
||||||
size: file.size,
|
size: file.size,
|
||||||
|
@ -408,7 +406,7 @@ class RoomsInput extends EventEmitter {
|
||||||
// Apply formatting if relevant
|
// Apply formatting if relevant
|
||||||
const formattedBody = formatAndEmojifyText(
|
const formattedBody = formatAndEmojifyText(
|
||||||
this.matrixClient.getRoom(roomId),
|
this.matrixClient.getRoom(roomId),
|
||||||
editedBody
|
editedBody,
|
||||||
);
|
);
|
||||||
if (formattedBody !== editedBody) {
|
if (formattedBody !== editedBody) {
|
||||||
content.formatted_body = ` * ${formattedBody}`;
|
content.formatted_body = ` * ${formattedBody}`;
|
||||||
|
|
Loading…
Reference in a new issue