Timeline: Resize message if any attachment is no longer pending
This commit is contained in:
parent
93ee9ae2b2
commit
dbc312e189
2 changed files with 3 additions and 21 deletions
|
@ -11,12 +11,3 @@ export function getBubbleProps(attributes: any) {
|
||||||
|
|
||||||
return model.getPropsForBubble();
|
return model.getPropsForBubble();
|
||||||
}
|
}
|
||||||
|
|
||||||
export function isVoiceFlag(flags: any): boolean {
|
|
||||||
// @ts-ignore
|
|
||||||
const protoFlags = window.textsecure.protobuf.AttachmentPointer.Flags;
|
|
||||||
const VOICE_MESSAGE_FLAG = protoFlags.VOICE_MESSAGE;
|
|
||||||
|
|
||||||
// tslint:disable-next-line no-bitwise
|
|
||||||
return Boolean(flags && flags & VOICE_MESSAGE_FLAG);
|
|
||||||
}
|
|
||||||
|
|
|
@ -10,13 +10,8 @@ import {
|
||||||
without,
|
without,
|
||||||
} from 'lodash';
|
} from 'lodash';
|
||||||
import { trigger } from '../../shims/events';
|
import { trigger } from '../../shims/events';
|
||||||
import { isVoiceFlag } from '../../shims/Whisper';
|
|
||||||
import { NoopActionType } from './noop';
|
import { NoopActionType } from './noop';
|
||||||
import {
|
import { AttachmentType } from '../../types/Attachment';
|
||||||
AttachmentType,
|
|
||||||
isImageAttachment,
|
|
||||||
isVideoAttachment,
|
|
||||||
} from '../../types/Attachment';
|
|
||||||
|
|
||||||
// State
|
// State
|
||||||
|
|
||||||
|
@ -536,16 +531,12 @@ function hasMessageHeightChanged(
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
const singleVisualAttachmentNoLongerPending =
|
const firstAttachmentNoLongerPending =
|
||||||
messageAttachments.length === 1 &&
|
|
||||||
previousAttachments[0] &&
|
previousAttachments[0] &&
|
||||||
previousAttachments[0].pending &&
|
previousAttachments[0].pending &&
|
||||||
messageAttachments[0] &&
|
messageAttachments[0] &&
|
||||||
(isImageAttachment(messageAttachments[0]) ||
|
|
||||||
isVideoAttachment(messageAttachments[0]) ||
|
|
||||||
isVoiceFlag(messageAttachments[0].flags)) &&
|
|
||||||
!messageAttachments[0].pending;
|
!messageAttachments[0].pending;
|
||||||
if (singleVisualAttachmentNoLongerPending) {
|
if (firstAttachmentNoLongerPending) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue