chore: rename to "isMounted"

Author: lbendavid-cloudinary

packages/html/__tests__/HtmlImageLayer.test.ts

@@ -6,7 +6,6 @@ import {placeholder} from "../src/plugins/placeholder";
 import {accessibility} from "../src/plugins/accessibility";
 import {PluginResponse} from "../types";
 import {cancelCurrentlyRunningPlugins} from "../src/utils/cancelCurrentlyRunningPlugins";
-import * as process from "process";
 
 jest.useFakeTimers();
 
@@ -54,53 +53,45 @@ describe('HtmlImageLayer tests', function () {
         expect(img.src).toEqualAnalyticsToken('AXAABABD');
     });
 
-    it('should set image src twice if HtmlImageLayer instance won\'t be destroyed', async function () {
+    it('should set image src twice if HtmlImageLayer instance won\'t be unmounted', async function () {
         const img = document.createElement('img');
         const pluginsState: any = {
             cleanupCallbacks: []
         };
         const spy = jest.spyOn(img, 'setAttribute');
-        const dummyFailingPlugin = (): Promise<PluginResponse> => {
-            return new Promise((resolve) => {
-                pluginsState.cleanupCallbacks.push(() => {
-                    resolve('canceled')
-                })
+        const dummyFailingPlugin = (): Promise<PluginResponse> => new Promise((resolve) => {
+            pluginsState.cleanupCallbacks.push(() => {
+                resolve('canceled')
             })
-        }
-        const dummyLazyLoadPlugin = (): Promise<PluginResponse> => {
-            return new Promise((resolve) => {
-                resolve({lazyload: true});
-            })
-        }
+        });
+        const dummyLazyLoadPlugin = (): Promise<PluginResponse> => new Promise((resolve) => {
+            resolve({lazyload: true});
+        });
         new HtmlImageLayer(img, cldImage, [dummyFailingPlugin]);
         new HtmlImageLayer(img, cldImage, [dummyLazyLoadPlugin]);
         cancelCurrentlyRunningPlugins(pluginsState);
         await flushPromises();
         expect(spy).toHaveBeenCalledTimes(2);
     });
 
-    it('should set image src only once if HtmlImageLayer instance will be destroyed', async function () {
+    it('should set image src only once if HtmlImageLayer instance will be unmounted', async function () {
         const img = document.createElement('img');
         const pluginsState: any = {
             cleanupCallbacks: []
         };
         const spy = jest.spyOn(img, 'setAttribute');
-        const dummyFailingPlugin = (): Promise<PluginResponse> => {
-            return new Promise((resolve) => {
-                pluginsState.cleanupCallbacks.push(() => {
-                    resolve('canceled')
-                })
-            })
-        }
-        const dummyLazyLoadPlugin = (): Promise<PluginResponse> => {
-            return new Promise((resolve) => {
-                resolve({lazyload: true});
+        const dummyFailingPlugin = (): Promise<PluginResponse> => new Promise((resolve) => {
+            pluginsState.cleanupCallbacks.push(() => {
+                resolve('canceled')
             })
-        }
+        });
+        const dummyLazyLoadPlugin = (): Promise<PluginResponse> => new Promise((resolve) => {
+            resolve({lazyload: true});
+        });
         const instance1 = new HtmlImageLayer(img, cldImage, [dummyFailingPlugin]);
         new HtmlImageLayer(img, cldImage, [dummyLazyLoadPlugin]);
         cancelCurrentlyRunningPlugins(pluginsState);
-        instance1.destroy();
+        instance1.unmount();
         await flushPromises();
         expect(spy).toHaveBeenCalledTimes(1);
     });

packages/html/src/layers/htmlImageLayer.ts

@@ -6,7 +6,7 @@ import {getAnalyticsOptions} from "../utils/analytics";
 
 export class HtmlImageLayer{
   private imgElement: any;
-  private destroyed = false;
+  private isMounted = true;
   htmlPluginState: HtmlPluginState;
   constructor(element: HTMLImageElement | null, userCloudinaryImage: CloudinaryImage, plugins?: Plugins, baseAnalyticsOptions?: BaseAnalyticsOptions){
     this.imgElement = element;
@@ -15,7 +15,7 @@ export class HtmlImageLayer{
 
     render(element, pluginCloudinaryImage, plugins, this.htmlPluginState, baseAnalyticsOptions)
         .then((pluginResponse)=>{ // when resolved updates the src
-          if (this.destroyed) {
+          if (!this.isMounted) {
               return;
           }
           this.htmlPluginState.pluginEventSubscription.forEach(fn=>{fn()});
@@ -34,14 +34,14 @@ export class HtmlImageLayer{
     const pluginCloudinaryImage  = cloneDeep(userCloudinaryImage);
     render(this.imgElement, pluginCloudinaryImage, plugins, this.htmlPluginState)
         .then((pluginResponse)=>{
-            if (this.destroyed) {
+            if (!this.isMounted) {
                 return;
             }
             const featuredAnalyticsOptions = getAnalyticsOptions(baseAnalyticsOptions, pluginResponse);
             this.imgElement.setAttribute('src', pluginCloudinaryImage.toURL(featuredAnalyticsOptions));
         });
   }
-  destroy() {
-      this.destroyed = true;
+  unmount() {
+      this.isMounted = false;
   }
 }

packages/react/src/AdvancedImage.tsx

@@ -102,7 +102,7 @@ class AdvancedImage extends React.Component <ImgProps> {
   componentWillUnmount() {
     // Safely cancel running events on unmount.
     cancelCurrentlyRunningPlugins(this.htmlLayerInstance.htmlPluginState);
-    this.htmlLayerInstance.destroy();
+    this.htmlLayerInstance.unmount();
   }
 
   render() {