From 286935cfa40913a3a0dcf79ae09036ffabb94526 Mon Sep 17 00:00:00 2001 From: Lior Ben-David Date: Sun, 19 Mar 2023 09:47:35 +0200 Subject: [PATCH 1/2] fix: return last plugin response --- packages/html/src/utils/render.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/html/src/utils/render.ts b/packages/html/src/utils/render.ts index 7b13a5ef..da2837f1 100644 --- a/packages/html/src/utils/render.ts +++ b/packages/html/src/utils/render.ts @@ -1,4 +1,4 @@ -import {Plugins, HtmlPluginState, BaseAnalyticsOptions} from '../types' +import {Plugins, HtmlPluginState, BaseAnalyticsOptions, PluginResponse} from '../types' import {CloudinaryVideo, CloudinaryImage} from "@cloudinary/url-gen"; /** @@ -11,13 +11,13 @@ import {CloudinaryVideo, CloudinaryImage} from "@cloudinary/url-gen"; * @param analyticsOptions {BaseAnalyticsOptions} analytics options for the url to be created */ export async function render(element: HTMLImageElement | HTMLVideoElement, pluginCloudinaryAsset: CloudinaryImage | CloudinaryVideo, plugins: Plugins, pluginState: HtmlPluginState, analyticsOptions?: BaseAnalyticsOptions) { - if(plugins === undefined) return; - for(let i = 0; i < plugins.length; i++){ - const response = await plugins[i](element, pluginCloudinaryAsset, pluginState, analyticsOptions); - if(response === 'canceled'){ + if (plugins === undefined) return; + let response: PluginResponse; + for (let i = 0; i < plugins.length; i++) { + response = await plugins[i](element, pluginCloudinaryAsset, pluginState, analyticsOptions); + if (response === 'canceled') { break; - } else { - return response } } + return response } From 1f725b8540dd9b61bc7a66e3958d159ac3b5eb45 Mon Sep 17 00:00:00 2001 From: Lior Ben-David Date: Mon, 20 Mar 2023 09:03:35 +0200 Subject: [PATCH 2/2] fix: return last plugin response --- packages/html/src/utils/render.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/html/src/utils/render.ts b/packages/html/src/utils/render.ts index da2837f1..fc8825d5 100644 --- a/packages/html/src/utils/render.ts +++ b/packages/html/src/utils/render.ts @@ -19,5 +19,7 @@ export async function render(element: HTMLImageElement | HTMLVideoElement, plugi break; } } - return response + if (response !== 'canceled') { + return response; + } }