chore: refactoring

Author: pioner92

android/build.gradle

@@ -103,14 +103,4 @@ dependencies {
 }
 
 
-// if(isNewArchitectureEnabled()){
-//   react {
-//     jsRootDir = file("$projectDir/../src")
-//     libraryName = "AutoSkeletonView"
-//     codegenJavaPackageName = "com.autoskeleton"
-//   }
-//   sourceSets {
-//     main { java.srcDirs += ["build/generated/source/codegen/java"] }
-//   }
-// }
 

example/ios/Podfile.lock

@@ -1238,7 +1238,7 @@ PODS:
     - React-jsiexecutor
     - React-RCTFBReactNativeSpec
     - ReactCommon/turbomodule/core
-  - react-native-auto-skeleton (0.1.18):
+  - react-native-auto-skeleton (0.1.28):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1799,7 +1799,7 @@ SPEC CHECKSUMS:
   React-logger: 74ddb793d36b48bba176328c7af75e5e656fd405
   React-Mapbuffer: 39e87693178fd6483bb5ca8b851fae362d49409a
   React-microtasksnativemodule: b740ebae7fad70aa78bc24cc0dfc15ac9637b6eb
-  react-native-auto-skeleton: f673e1d3dad6ed3d815dbbfbc797a9ff1b6ca583
+  react-native-auto-skeleton: 77f1f2e3567ddc6bf92fa8fe5b5a3582e2f5c65f
   React-NativeModulesApple: af0571ac115d09c9a669ed45ce6a4ca960598a2d
   React-perflogger: 26d07766b033f84559bd520e949453dba8bf1cd8
   React-performancetimeline: 0f3e0b6e2152951257bd8c90f95d527cf4316fa8

ios/React/AutoSkeletonIgnoreView.mm

@@ -1,9 +1,9 @@
 #import "AutoSkeletonIgnoreView.h"
 
-#import "../generated/RNAutoSkeletonViewSpec/ComponentDescriptors.h"
-#import "../generated/RNAutoSkeletonViewSpec/EventEmitters.h"
-#import "../generated/RNAutoSkeletonViewSpec/Props.h"
-#import "../generated/RNAutoSkeletonViewSpec/RCTComponentViewHelpers.h"
+#import "react/renderer/components/RNAutoSkeletonViewSpec/ComponentDescriptors.h"
+#import "react/renderer/components/RNAutoSkeletonViewSpec/EventEmitters.h"
+#import "react/renderer/components/RNAutoSkeletonViewSpec/Props.h"
+#import "react/renderer/components/RNAutoSkeletonViewSpec/RCTComponentViewHelpers.h"
 
 #import "RCTFabricComponentsPlugins.h"
 

ios/React/AutoSkeletonView.mm

@@ -1,9 +1,9 @@
 #import "AutoSkeletonView.h"
 
-#import "../generated/RNAutoSkeletonViewSpec/ComponentDescriptors.h"
-#import "../generated/RNAutoSkeletonViewSpec/EventEmitters.h"
-#import "../generated/RNAutoSkeletonViewSpec/Props.h"
-#import "../generated/RNAutoSkeletonViewSpec/RCTComponentViewHelpers.h"
+#import "react/renderer/components/RNAutoSkeletonViewSpec/ComponentDescriptors.h"
+#import "react/renderer/components/RNAutoSkeletonViewSpec/EventEmitters.h"
+#import "react/renderer/components/RNAutoSkeletonViewSpec/Props.h"
+#import "react/renderer/components/RNAutoSkeletonViewSpec/RCTComponentViewHelpers.h"
 
 #import "RCTFabricComponentsPlugins.h"
 #if __has_include(<react_native_auto_skeleton/react_native_auto_skeleton-Swift.h>)
@@ -33,15 +33,6 @@ + (ComponentDescriptorProvider)componentDescriptorProvider {
       AutoSkeletonViewComponentDescriptor>();
 }
 
-- (instancetype)init {
-  if (self = [super init]) {
-    _view = [SkeletonViewFabric new];
-    _view.userInteractionEnabled = NO;
-
-    self.contentView = _view;
-  }
-  return self;
-}
 
 - (instancetype)initWithFrame:(CGRect)frame {
   if (self = [super initWithFrame:frame]) {
@@ -52,8 +43,6 @@ - (instancetype)initWithFrame:(CGRect)frame {
     _view = [SkeletonViewFabric new];
     _view.userInteractionEnabled = NO;
 
-    [_view initOriginalViewsWithSubviews:self.subviews];
-
     self.contentView = _view;
   }
 

ios/SkeletonView/SkeletonCore.swift

@@ -128,11 +128,11 @@ public class SkeletonCore: UIView, PlaceholderMaskDelegate, SkeletonAnimatableDe
     views.removeAll()
 
     views = subviews.filter {
-      if $0.accessibilityIdentifier == Constants.IGNORE_VIEW_NAME {
+      if $0.accessibilityIdentifier == Constants.IGNORE_VIEW_NAME || ($0 is SkeletonCore) {
         return false
       }
 
-      if $0.backgroundColor != nil && $0.backgroundColor != .clear && !($0 is SkeletonCore) {
+      if hasBGColor($0) {
         return true
       }
 
@@ -164,4 +164,9 @@ public class SkeletonCore: UIView, PlaceholderMaskDelegate, SkeletonAnimatableDe
       self.animator.stop()
     })
   }
+
+  @inline(__always)
+  private func hasBGColor(_ view: UIView) -> Bool {
+    return view.backgroundColor != nil && view.backgroundColor != .clear
+  }
 }

react-native-auto-skeleton.podspec

@@ -17,7 +17,6 @@ Pod::Spec.new do |s|
   s.swift_version = "5.0"
   s.module_name = "react_native_auto_skeleton"
   s.source_files    = "ios/**/*.{m,mm,cpp,swift}"
-  s.private_header_files = "ios/generated/**/*.h"
 
   s.pod_target_xcconfig = {
     "DEFINES_MODULE" => "YES",

yarn.lock

@@ -12326,7 +12326,7 @@ __metadata:
 
 "typescript@patch:typescript@^5.2.2#~builtin<compat/typescript>":
   version: 5.8.2
-  resolution: "typescript@patch:typescript@npm%3A5.8.2#~builtin<compat/typescript>::version=5.8.2&hash=29ae49"
+  resolution: "typescript@patch:typescript@npm%3A5.8.2#~builtin<compat/typescript>::version=5.8.2&hash=14eedb"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver