@uibit/image-comparison 0.1.1 → 0.2.0

package/dist/frameworks/angular/index.ts

@@ -1,51 +1,54 @@
-import { Component, ChangeDetectionStrategy, ElementRef, input, effect, output, booleanAttribute, numberAttribute } from '@angular/core';
+import { Component, ChangeDetectionStrategy, ElementRef, model, input, effect, output, booleanAttribute, numberAttribute } from '@angular/core';
 import '@uibit/image-comparison';
 import type { ImageComparison as HTMLElementClass } from '@uibit/image-comparison';
 import type { ComparisonMode } from '@uibit/image-comparison';
-
 @Component({
-  selector: 'uibit-image-comparison',
-  template: '<ng-content></ng-content>',
-  changeDetection: ChangeDetectionStrategy.OnPush,
-  standalone: true,
-  host: {
-    '(comparison-progress)': 'comparisonProgress.emit($event)'
-  }
+    selector: 'uibit-image-comparison',
+    template: '<ng-content></ng-content>',
+    changeDetection: ChangeDetectionStrategy.OnPush,
+    standalone: true,
+    host: {
+        '(comparison-progress)': 'comparisonProgress.emit($event); progress.set($event.detail?.progress !== undefined ? $event.detail.progress : $event.target.progress)'
+    }
 })
 export class NgxImageComparison {
-  constructor(private el: ElementRef<HTMLElementClass>) {
-    effect(() => {
-      if (this.el.nativeElement) {
-        this.el.nativeElement.mode = this.mode();
-      }
+    constructor(private el: ElementRef<HTMLElementClass>){
+        effect(()=>{
+            if (this.el.nativeElement) {
+                this.el.nativeElement.mode = this.mode();
+            }
+        });
+        effect(()=>{
+            if (this.el.nativeElement) {
+                this.el.nativeElement.progress = this.progress();
+            }
+        });
+        effect(()=>{
+            if (this.el.nativeElement) {
+                this.el.nativeElement.interactive = this.interactive();
+            }
+        });
+        effect(()=>{
+            if (this.el.nativeElement) {
+                this.el.nativeElement.hoverReveal = this.hoverReveal();
+            }
+        });
+        effect(()=>{
+            if (this.el.nativeElement) {
+                this.el.nativeElement.locale = this.locale();
+            }
+        });
+    }
+    readonly mode = input<ComparisonMode>('horizontal');
+    readonly progress = model<number>(50);
+    readonly interactive = input<boolean, any>(true, {
+        transform: booleanAttribute
     });
-    effect(() => {
-      if (this.el.nativeElement) {
-        this.el.nativeElement.progress = this.progress();
-      }
+    readonly hoverReveal = input<boolean, any>(false, {
+        transform: booleanAttribute
     });
-    effect(() => {
-      if (this.el.nativeElement) {
-        this.el.nativeElement.interactive = this.interactive();
-      }
-    });
-    effect(() => {
-      if (this.el.nativeElement) {
-        this.el.nativeElement.hoverReveal = this.hoverReveal();
-      }
-    });
-    effect(() => {
-      if (this.el.nativeElement) {
-        this.el.nativeElement.locale = this.locale();
-      }
-    });
-  }
-
-  readonly mode = input<ComparisonMode, any>('horizontal');
-  readonly progress = input<number, any>(50, { transform: numberAttribute });
-  readonly interactive = input<boolean, any>(true, { transform: booleanAttribute });
-  readonly hoverReveal = input<boolean, any>(false, { transform: booleanAttribute });
-  readonly locale = input<string, any>('');
-
-  readonly comparisonProgress = output<CustomEvent<progress: number>>();
+    readonly locale = input<string>('');
+    readonly comparisonProgress = output<CustomEvent<{
+        progress: number;
+    }>>();
 }

package/dist/frameworks/astro/index.d.ts

@@ -1,10 +1,18 @@
 import type { ImageComparison as HTMLElementClass } from '@uibit/image-comparison';
 import '@uibit/image-comparison';
+import type { ComparisonMode } from '@uibit/image-comparison';
 
 declare global {
   namespace astroHTML.JSX {
     interface IntrinsicElements {
-      'uibit-image-comparison': Partial<HTMLElementClass> & astroHTML.JSX.HTMLAttributes;
+      'uibit-image-comparison': Partial<HTMLElementClass> & astroHTML.JSX.HTMLAttributes & {
+      mode?: ComparisonMode;
+      progress?: number;
+      interactive?: boolean;
+      hoverReveal?: boolean;
+      locale?: string;
+      "on:comparison-progress"?: (event: CustomEvent<{ progress: number }>) => void;
+      };
     }
   }
 }

package/dist/frameworks/preact/index.d.ts

@@ -12,6 +12,8 @@ declare module 'preact' {
       interactive?: boolean;
       hoverReveal?: boolean;
       locale?: string;
+      onComparisonProgress?: (event: CustomEvent<{ progress: number }>) => void;
+      "on:comparison-progress"?: (event: CustomEvent<{ progress: number }>) => void;
       };
     }
   }

package/dist/frameworks/react/index.ts

@@ -0,0 +1,115 @@
+import React, { useRef, useEffect, useLayoutEffect, useImperativeHandle } from 'react';
+import type { ImageComparison as HTMLElementClass } from '@uibit/image-comparison';
+import '@uibit/image-comparison';
+import type { ComparisonMode } from '@uibit/image-comparison';
+const useTypeOfLayoutEffect = typeof window !== 'undefined' ? useLayoutEffect : useEffect;
+export interface ImageComparisonProps extends Omit<React.HTMLAttributes<HTMLElementClass>, 'mode' | 'progress' | 'interactive' | 'hoverReveal' | 'locale' | 'onComparisonProgress'> {
+    children?: React.ReactNode;
+    mode?: ComparisonMode;
+    progress?: number;
+    interactive?: boolean;
+    hoverReveal?: boolean;
+    locale?: string;
+    onComparisonProgress?: (event: CustomEvent<{
+        progress: number;
+    }>) => void;
+}
+export const ImageComparison = ({ ref, children, ...props }: ImageComparisonProps & {
+    ref?: React.Ref<HTMLElementClass>;
+})=>{
+    const innerRef = useRef<HTMLElementClass>(null);
+    const propsRef = useRef(props);
+    propsRef.current = props;
+    useImperativeHandle(ref, ()=>innerRef.current!);
+    useTypeOfLayoutEffect(()=>{
+        const element = innerRef.current;
+        if (element && props.mode !== undefined) {
+            (element as any).mode = props.mode;
+        }
+    }, [
+        props.mode
+    ]);
+    useTypeOfLayoutEffect(()=>{
+        const element = innerRef.current;
+        if (element && props.progress !== undefined) {
+            (element as any).progress = props.progress;
+        }
+    }, [
+        props.progress
+    ]);
+    useTypeOfLayoutEffect(()=>{
+        const element = innerRef.current;
+        if (element && props.interactive !== undefined) {
+            (element as any).interactive = props.interactive;
+        }
+    }, [
+        props.interactive
+    ]);
+    useTypeOfLayoutEffect(()=>{
+        const element = innerRef.current;
+        if (element && props.hoverReveal !== undefined) {
+            (element as any).hoverReveal = props.hoverReveal;
+        }
+    }, [
+        props.hoverReveal
+    ]);
+    useTypeOfLayoutEffect(()=>{
+        const element = innerRef.current;
+        if (element && props.locale !== undefined) {
+            (element as any).locale = props.locale;
+        }
+    }, [
+        props.locale
+    ]);
+    useTypeOfLayoutEffect(()=>{
+        const element = innerRef.current;
+        if (!element) return;
+        const handleEvent = (event: Event)=>{
+            if (propsRef.current.onComparisonProgress) {
+                propsRef.current.onComparisonProgress(event as any);
+            }
+        };
+        element.addEventListener('comparison-progress', handleEvent);
+        return ()=>{
+            element.removeEventListener('comparison-progress', handleEvent);
+        };
+    }, []);
+    const domProps = {
+        ...props
+    };
+    const customPropNames = [
+        'mode',
+        'progress',
+        'interactive',
+        'hoverReveal',
+        'locale',
+        'onComparisonProgress'
+    ];
+    for (const key of customPropNames){
+        delete (domProps as any)[key];
+    }
+    return React.createElement('uibit-image-comparison', {
+        ref: innerRef,
+        ...domProps
+    }, children);
+};
+declare global {
+    namespace React {
+        namespace JSX {
+            interface IntrinsicElements {
+                'uibit-image-comparison': React.ClassAttributes<HTMLElementClass> & React.HTMLAttributes<HTMLElementClass> & {
+                    children?: React.ReactNode;
+                    class?: string;
+                    mode?: ComparisonMode;
+                    progress?: number;
+                    interactive?: boolean;
+                    hoverReveal?: boolean;
+                    locale?: string;
+                    onComparisonProgress?: (event: CustomEvent<{
+                        progress: number;
+                    }>) => void;
+                };
+            }
+        }
+    }
+}

package/dist/frameworks/solid/index.d.ts

@@ -12,7 +12,7 @@ declare module 'solid-js' {
       interactive?: boolean;
       hoverReveal?: boolean;
       locale?: string;
-      "on:comparison-progress"?: (event: CustomEvent) => void;
+      "on:comparison-progress"?: (event: CustomEvent<{ progress: number }>) => void;
       };
     }
   }

package/dist/frameworks/stencil/index.d.ts

@@ -11,6 +11,8 @@ declare module '@stencil/core' {
     interactive?: boolean;
     hoverReveal?: boolean;
     locale?: string;
+    onComparisonProgress?: (event: CustomEvent<{ progress: number }>) => void;
+    "on:comparison-progress"?: (event: CustomEvent<{ progress: number }>) => void;
       };
     }
   }

package/dist/frameworks/svelte/index.svelte

@@ -2,47 +2,82 @@
   import '@uibit/image-comparison';
   import type { ImageComparison as HTMLElementClass } from '@uibit/image-comparison';
   import type { ComparisonMode } from '@uibit/image-comparison';
-  
-  let {
-    mode = undefined,
-      progress = undefined,
-      interactive = undefined,
-      hoverReveal = undefined,
-      locale = undefined,
-      children
+
+let {
+    mode = $bindable(),
+    progress = $bindable(),
+    interactive = $bindable(),
+    hoverReveal = $bindable(),
+    locale = $bindable(),
+    children,
+    ...restProps
   } = $props<{
-    children?: any;
+    children?: import('svelte').Snippet;
     mode?: ComparisonMode;
     progress?: number;
     interactive?: boolean;
     hoverReveal?: boolean;
     locale?: string;
-  
+
+    [key: string]: any;
   }>();
-  
-  let elementRef: HTMLElementClass | null = $state(null);
-  
-  $effect(() => {
-    if (elementRef && mode !== undefined) {
+
+let elementRef: HTMLElementClass | null = $state(null);
+
+$effect(() => {
+    if (elementRef && mode !== undefined && elementRef.mode !== mode) {
       elementRef.mode = mode;
     }
-    if (elementRef && progress !== undefined) {
+    if (elementRef && progress !== undefined && elementRef.progress !== progress) {
       elementRef.progress = progress;
     }
-    if (elementRef && interactive !== undefined) {
+    if (elementRef && interactive !== undefined && elementRef.interactive !== interactive) {
       elementRef.interactive = interactive;
     }
-    if (elementRef && hoverReveal !== undefined) {
+    if (elementRef && hoverReveal !== undefined && elementRef.hoverReveal !== hoverReveal) {
       elementRef.hoverReveal = hoverReveal;
     }
-    if (elementRef && locale !== undefined) {
+    if (elementRef && locale !== undefined && elementRef.locale !== locale) {
       elementRef.locale = locale;
     }
   });
-  
+
+$effect(() => {
+    const element = elementRef;
+    if (!element) return;
+
+    const handleEvent = () => {
+      if (mode !== element.mode) {
+        mode = element.mode as any;
+      }
+      if (progress !== element.progress) {
+        progress = element.progress as any;
+      }
+      if (interactive !== element.interactive) {
+        interactive = element.interactive as any;
+      }
+      if (hoverReveal !== element.hoverReveal) {
+        hoverReveal = element.hoverReveal as any;
+      }
+      if (locale !== element.locale) {
+        locale = element.locale as any;
+      }
+    };
+
+    const events = ['change', 'input', 'comparison-progress'];
+    for (const event of events) {
+      element.addEventListener(event, handleEvent);
+    }
+    return () => {
+      for (const event of events) {
+        element.removeEventListener(event, handleEvent);
+      }
+    };
+  });
+
 </script>
 
-<uibit-image-comparison bind:this={elementRef} {...$$restProps}>
+<uibit-image-comparison bind:this={elementRef} {...restProps}>
 
   {#if children}
     {@render children()}

package/dist/frameworks/vue/index.ts

@@ -1,29 +1,112 @@
-import { defineComponent, h } from 'vue';
+import { defineComponent, h, ref, watch } from 'vue';
 import type { ImageComparison as HTMLElementClass } from '@uibit/image-comparison';
 import '@uibit/image-comparison';
 import type { ComparisonMode } from '@uibit/image-comparison';
-
 export const ImageComparison = defineComponent({
-  name: 'ImageComparison',
-  props: {
-    mode: { type: [String, Number, Boolean, Array, Object] as any },
-    progress: { type: [String, Number, Boolean, Array, Object] as any },
-    interactive: { type: [String, Number, Boolean, Array, Object] as any },
-    hoverReveal: { type: [String, Number, Boolean, Array, Object] as any },
-    locale: { type: [String, Number, Boolean, Array, Object] as any }
-  },
-  emits: ['comparison-progress'],
-  setup(props, { slots, emit }) {
-    return () => {
-      const eventListeners: Record<string, any> = {};
-      eventListeners['onComparison-progress'] = (event: Event) => {
-        emit('comparison-progress', event);
-      };
-
-      return h('uibit-image-comparison', {
-        ...props,
-        ...eventListeners
-      }, slots.default?.());
-    };
-  }
+    name: 'ImageComparison',
+    props: {
+        mode: {
+            type: [
+                String,
+                Number,
+                Boolean,
+                Array,
+                Object
+            ] as any
+        },
+        progress: {
+            type: [
+                String,
+                Number,
+                Boolean,
+                Array,
+                Object
+            ] as any
+        },
+        interactive: {
+            type: [
+                String,
+                Number,
+                Boolean,
+                Array,
+                Object
+            ] as any
+        },
+        hoverReveal: {
+            type: [
+                String,
+                Number,
+                Boolean,
+                Array,
+                Object
+            ] as any
+        },
+        locale: {
+            type: [
+                String,
+                Number,
+                Boolean,
+                Array,
+                Object
+            ] as any
+        }
+    },
+    emits: [
+        'comparison-progress'
+    ],
+    setup (props, { slots, emit }) {
+        const elementRef = ref<HTMLElementClass | null>(null);
+        if (false) {
+            watch(()=>props.modelValue, (newVal)=>{
+                if (elementRef.value && newVal !== undefined && elementRef.value.value !== newVal) {
+                    elementRef.value.value = newVal;
+                }
+            });
+            watch(()=>props.value, (newVal)=>{
+                if (elementRef.value && newVal !== undefined && elementRef.value.value !== newVal) {
+                    elementRef.value.value = newVal;
+                }
+            });
+        }
+        watch(()=>props.mode, (newVal)=>{
+            if (elementRef.value && newVal !== undefined) {
+                (elementRef.value as any).mode = newVal;
+            }
+        });
+        watch(()=>props.progress, (newVal)=>{
+            if (elementRef.value && newVal !== undefined) {
+                (elementRef.value as any).progress = newVal;
+            }
+        });
+        watch(()=>props.interactive, (newVal)=>{
+            if (elementRef.value && newVal !== undefined) {
+                (elementRef.value as any).interactive = newVal;
+            }
+        });
+        watch(()=>props.hoverReveal, (newVal)=>{
+            if (elementRef.value && newVal !== undefined) {
+                (elementRef.value as any).hoverReveal = newVal;
+            }
+        });
+        watch(()=>props.locale, (newVal)=>{
+            if (elementRef.value && newVal !== undefined) {
+                (elementRef.value as any).locale = newVal;
+            }
+        });
+        return ()=>{
+            const eventListeners: Record<string, any> = {};
+            eventListeners['onComparison-progress'] = (event: Event)=>{
+                emit('comparison-progress', event);
+            };
+            const mergedProps = {
+                ...props,
+                ...eventListeners,
+                ref: elementRef
+            };
+            if (false && props.modelValue !== undefined) {
+                (mergedProps as any).value = props.modelValue;
+            }
+            return h('uibit-image-comparison', mergedProps, slots.default?.());
+        };
+    }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uibit/image-comparison",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "Displays overlapping before/after content layers with interactive diagonal, radial, horizontal, or vertical splits.",
   "type": "module",
   "main": "./dist/index.js",
@@ -12,7 +12,7 @@
     },
     "./image-comparison.css": "./dist/image-comparison.css",
     "./custom-elements.json": "./custom-elements.json",
-    "./react": "./dist/frameworks/react/index.d.ts",
+    "./react": "./dist/frameworks/react/index.ts",
     "./vue": "./dist/frameworks/vue/index.ts",
     "./svelte": "./dist/frameworks/svelte/index.svelte",
     "./angular": "./dist/frameworks/angular/index.ts",
@@ -54,7 +54,7 @@
     "@types/node": "^20.19.43",
     "lit": "^3.3.3",
     "typescript": "7.0.2",
-    "@uibit/codegen": "0.1.0"
+    "@uibit/codegen": "0.2.0"
   },
   "peerDependencies": {
     "lit": "^3.0.0",

package/dist/frameworks/react/index.d.ts

@@ -1,23 +0,0 @@
-import type { HTMLAttributes, ClassAttributes } from 'react';
-import type { ImageComparison as HTMLElementClass } from '@uibit/image-comparison';
-import '@uibit/image-comparison';
-import type { ComparisonMode } from '@uibit/image-comparison';
-
-declare global {
-  namespace React {
-    namespace JSX {
-      interface IntrinsicElements {
-        'uibit-image-comparison': ClassAttributes<HTMLElementClass> & HTMLAttributes<HTMLElementClass> & {
-          children?: React.ReactNode;
-          class?: string;
-      mode?: ComparisonMode;
-      progress?: number;
-      interactive?: boolean;
-      hoverReveal?: boolean;
-      locale?: string;
-      onComparisonProgress?: (event: any) => void;
-        };
-      }
-    }
-  }
-}