react-native-gleam 1.0.3 → 1.0.5

package/android/src/main/java/com/gleam/GleamView.kt

@@ -11,6 +11,7 @@ import android.graphics.RectF
 import android.graphics.Shader
 import android.os.SystemClock
 import android.view.Choreographer
+import android.view.View
 import android.view.animation.DecelerateInterpolator
 import androidx.annotation.UiThread
 import com.facebook.react.bridge.Arguments
@@ -171,6 +172,22 @@ class GleamView(context: Context) : ReactViewGroup(context) {
         }
     }
 
+    override fun onVisibilityChanged(changedView: View, visibility: Int) {
+        super.onVisibilityChanged(changedView, visibility)
+        if (!didAttach) return
+
+        if (visibility == VISIBLE) {
+            if (loading) {
+                registerClock()
+                invalidate()
+            } else if (!isTransitioning) {
+                contentOpacity = 1f
+                shimmerOpacity = 0f
+                invalidate()
+            }
+        }
+    }
+
     /** Called by ViewManager when the view is dropped */
     fun cleanup() {
         unregisterClock()

package/ios/GleamView.mm

@@ -26,6 +26,7 @@ static GleamView * __strong *_views = NULL;
 static NSUInteger _viewCount = 0;
 static NSUInteger _viewCapacity = 0;
 static CADisplayLink *_displayLink;
+static void *kHiddenKVOContext = &kHiddenKVOContext;
 
 static void _startDisplayLinkIfNeeded(void) {
     if (_displayLink) return;
@@ -103,6 +104,7 @@ static void _unregisterView(GleamView *view) {
     CGFloat _contentAlpha;
     CGFloat _lastSetChildrenAlpha;
     BOOL _didInitialSetup;
+    BOOL _isObservingHidden;
 }
 
 + (ComponentDescriptorProvider)componentDescriptorProvider
@@ -158,6 +160,9 @@ static void _unregisterView(GleamView *view) {
             @"transform": [NSNull null],
         };
         _shimmerLayer.locations = @[@0.0, @0.5, @1.0];
+
+        [self addObserver:self forKeyPath:@"hidden" options:NSKeyValueObservingOptionOld | NSKeyValueObservingOptionNew context:kHiddenKVOContext];
+        _isObservingHidden = YES;
     }
     return self;
 }
@@ -190,6 +195,28 @@ static void _unregisterView(GleamView *view) {
     }
 }
 
+- (void)didMoveToWindow
+{
+    [super didMoveToWindow];
+    if (!self.window) return;
+
+    // View (re)joined a window — resync visual state.
+    // Mirrors Android's onAttachedToWindow re-attachment path.
+    if (_loading) {
+        if (_shimmerLayer.superlayer != self.layer) {
+            [self.layer addSublayer:_shimmerLayer];
+        }
+        [self _registerClock];
+    } else if (!_isTransitioning) {
+        // _isTransitioning=YES means ticks are actively driving it to
+        // completion (we no longer bail on !self.window) — let it finish.
+        [self _setChildrenAlphaIfNeeded:1.0];
+        _shimmerLayer.opacity = 0.0;
+        [_shimmerLayer removeFromSuperlayer];
+        [self _unregisterClock];
+    }
+}
+
 - (void)removeFromSuperview
 {
     [self _unregisterClock];
@@ -214,6 +241,10 @@ static void _unregisterView(GleamView *view) {
 
 - (void)prepareForRecycle
 {
+    if (_isObservingHidden) {
+        [self removeObserver:self forKeyPath:@"hidden" context:kHiddenKVOContext];
+        _isObservingHidden = NO;
+    }
     [super prepareForRecycle];
     [self _unregisterClock];
     _isTransitioning = NO;
@@ -227,6 +258,9 @@ static void _unregisterView(GleamView *view) {
     _loading = YES;
     _wasLoading = YES;
     _didInitialSetup = NO;
+
+    [self addObserver:self forKeyPath:@"hidden" options:NSKeyValueObservingOptionOld | NSKeyValueObservingOptionNew context:kHiddenKVOContext];
+    _isObservingHidden = YES;
 }
 
 // Invariant: a registered view (_isRegistered=YES) is held by the static
@@ -237,6 +271,10 @@ static void _unregisterView(GleamView *view) {
 // by the display link on the main thread. The view leaks in _views but no crash.
 - (void)dealloc
 {
+    if (_isObservingHidden) {
+        _isObservingHidden = NO;
+        [self removeObserver:self forKeyPath:@"hidden" context:kHiddenKVOContext];
+    }
     if (_isRegistered) {
         _isRegistered = NO;
         if ([NSThread isMainThread]) {
@@ -353,6 +391,36 @@ static void _unregisterView(GleamView *view) {
 
 #pragma mark - Private
 
+- (void)observeValueForKeyPath:(NSString *)keyPath
+                      ofObject:(id)object
+                        change:(NSDictionary<NSKeyValueChangeKey,id> *)change
+                       context:(void *)context
+{
+    if (context != kHiddenKVOContext) {
+        [super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
+        return;
+    }
+
+    BOOL wasHidden = [change[NSKeyValueChangeOldKey] boolValue];
+    BOOL isHidden = [change[NSKeyValueChangeNewKey] boolValue];
+
+    if (wasHidden && !isHidden) {
+        // hidden YES→NO: ancestor removed display:'none' — resync visual state
+        if (_loading) {
+            if (_shimmerLayer.superlayer != self.layer) {
+                [self.layer addSublayer:_shimmerLayer];
+            }
+            [self _registerClock];
+        } else if (!_isTransitioning) {
+            [self _setChildrenAlphaIfNeeded:1.0];
+            _shimmerOpacity = 0.0;
+            _shimmerLayer.opacity = 0.0;
+            [_shimmerLayer removeFromSuperlayer];
+            [self _unregisterClock];
+        }
+    }
+}
+
 - (CGFloat)_computeProgressWithTime:(CFTimeInterval)now
 {
     CGFloat effectiveTime = fmax(now - _delay, 0.0);
@@ -362,8 +430,10 @@ static void _unregisterView(GleamView *view) {
 
 - (void)_tickWithTime:(CFTimeInterval)now
 {
-    if (!self.window) return;
-
+    // Transitions must always complete to avoid stuck visual state when the
+    // view is hidden (display:'none' → hidden=YES) or has no window.
+    // Cost is bounded (≤ transitionDuration) and the ops are cheap property sets.
+    // Shimmer animation is cosmetic and unbounded — skip when not visible.
     if (_isTransitioning) {
         _transitionElapsed += _displayLink.duration;
         CGFloat t = _transitionDuration > 0 ? fmin(_transitionElapsed / _transitionDuration, 1.0) : 1.0;
@@ -436,6 +506,7 @@ static void _unregisterView(GleamView *view) {
             [self _finishTransition];
         }
     } else if (_loading) {
+        if (!self.window) return;
         [self _updateGradientPositionWithTime:now];
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-gleam",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "Native-powered shimmer loading effect for React Native",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",