Skip to content

Fix/post-message-target #876

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 30, 2025
Merged

Fix/post-message-target #876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b580f90
fix(file-item): hide waiting for social source hint after success upload
nd0ut Oct 29, 2025
03438cc
fix(social-source): use specified target origin for social source pos…
nd0ut Oct 29, 2025
cd9aa92
fix(social-source): toggle done button visibility along with selectio…
nd0ut Oct 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions src/blocks/ExternalSource/ExternalSource.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,11 +191,8 @@ export class ExternalSource extends UploaderBlock {
couldSelectAll: message.selectedCount < message.total,
couldDeselectAll: message.selectedCount === message.total,
selectedList: message.selectedFiles,
showDoneBtn: message.total > 0,
});

if (!this.$.showDoneBtn && message.isReady) {
this.$.showDoneBtn = true;
}
}

private handleIframeLoad(): void {
Expand Down Expand Up @@ -267,7 +264,7 @@ export class ExternalSource extends UploaderBlock {

this._messageBridge?.destroy();

this._messageBridge = new MessageBridge(iframe.contentWindow);
this._messageBridge = new MessageBridge(iframe.contentWindow, () => this.cfg.socialBaseUrl);
this._messageBridge.on('selected-files-change', this.handleSelectedFilesChange.bind(this));
this._messageBridge.on('toolbar-state-change', this.handleToolbarStateChange.bind(this));

Expand Down
12 changes: 8 additions & 4 deletions src/blocks/ExternalSource/MessageBridge.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,15 @@ const isWhitelistedMessage = (message: unknown): message is InputMessageMap[Inpu
};

export class MessageBridge {
_handlerMap = new Map<InputMessageType, Set<InputMessageHandler<InputMessageType>>>();
private _handlerMap = new Map<InputMessageType, Set<InputMessageHandler<InputMessageType>>>();

_context: Window;
private _context: Window;

constructor(context: Window) {
private _getTargetOrigin: () => string;

constructor(context: Window, getTargetOrigin: () => string) {
this._context = context;
this._getTargetOrigin = getTargetOrigin;

window.addEventListener('message', this._handleMessage);
}
Expand Down Expand Up @@ -52,7 +55,8 @@ export class MessageBridge {
}

send(message: OutputMessage) {
this._context.postMessage(message, '*');
const targetOrigin = this._getTargetOrigin();
this._context.postMessage(message, targetOrigin);
}

destroy() {
Expand Down
3 changes: 2 additions & 1 deletion src/blocks/FileItem/FileItem.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ export class FileItem extends FileItemConfig {
const errorText = entry.getValue('errors')?.[0]?.message;
const source = entry.getValue('source');
const externalUrl = entry.getValue('externalUrl');
const isFinished = state === FileItemState.FINISHED;
const isUploading = state === FileItemState.UPLOADING;
const isQueuedForUploading = state === FileItemState.QUEUED_UPLOADING;
const isQueuedForValidation = state === FileItemState.QUEUED_VALIDATION;
Expand All @@ -151,7 +152,7 @@ export class FileItem extends FileItemConfig {

if (errorText) {
hint = '';
} else if (externalUrl && source && Object.values(ExternalUploadSource).includes(source)) {
} else if (!isFinished && externalUrl && source && Object.values(ExternalUploadSource).includes(source)) {
hint = this.l10n('waiting-for', { source: this.l10n(`src-type-${source}`) });
}

Expand Down