add ifmatched modifier

8AGame · Jun 8, 2017 · 6c7c741 · 6c7c741
1 parent a0b8ce5
commit 6c7c741
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 12 deletions.
diff --git a/Hero.xcodeproj/project.pbxproj b/Hero.xcodeproj/project.pbxproj
@@ -1119,7 +1119,6 @@
 				PRODUCT_NAME = Hero;
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -1144,7 +1143,6 @@
 				PRODUCT_NAME = Hero;
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -1164,7 +1162,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.lkzhao.HeroTvOSExamples;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
-				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
@@ -1182,7 +1179,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.lkzhao.HeroTvOSExamples;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
-				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
@@ -1209,7 +1205,6 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -1235,7 +1230,6 @@
 				PRODUCT_NAME = Hero;
 				SKIP_INSTALL = YES;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -1296,6 +1290,7 @@
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -1345,6 +1340,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
+				SWIFT_VERSION = 3.0;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -1362,7 +1358,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.lkzhao.HeroExamples;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -1380,7 +1375,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.lkzhao.HeroExamples;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -1396,7 +1390,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.lkzhao.HeroTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/HeroExamples.app/HeroExamples";
 			};
 			name = Debug;
@@ -1412,7 +1405,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.lkzhao.HeroTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/HeroExamples.app/HeroExamples";
 			};
 			name = Release;

diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Sources/HeroModifier.swift b/Sources/HeroModifier.swift
@@ -502,6 +502,19 @@ extension HeroModifier {
     }
   }
 
+  /**
+   Apply modifiers at the start of the transition if the view is matched with another view.
+   Note that this will apply if a parent view is matched.
+   */
+  public static func ifMatched(modifiers: [HeroModifier]) -> HeroModifier {
+    return HeroModifier { targetState in
+      if targetState.ifMatched == nil {
+        targetState.ifMatched = []
+      }
+      targetState.ifMatched!.append(contentsOf: modifiers)
+    }
+  }
+
   /**
    Use global coordinate space.
 

diff --git a/Sources/HeroTargetState.swift b/Sources/HeroTargetState.swift
@@ -56,6 +56,7 @@ public struct HeroTargetState {
   }
   internal var beginState: HeroTargetStateWrapper?
   public var beginStateIfMatched: [HeroModifier]?
+  public var ifMatched: [HeroModifier]?
 
   public var position: CGPoint?
   public var size: CGSize?

diff --git a/Sources/Preprocessors/MatchPreprocessor.swift b/Sources/Preprocessors/MatchPreprocessor.swift
@@ -36,6 +36,8 @@ class MatchPreprocessor: BasePreprocessor {
       if let beginStateIfMatched = fvState.beginStateIfMatched {
         fvState.append(.beginWith(modifiers: beginStateIfMatched))
       }
+      applyIfMatchedSubviewModifiers(tv)
+      applyIfMatchedSubviewModifiers(fv)
 
       // match is just a two-way source effect
       tvState.source = id
@@ -80,4 +82,14 @@ class MatchPreprocessor: BasePreprocessor {
       context[fv] = fvState
     }
   }
+
+  private func applyIfMatchedSubviewModifiers(_ view: UIView) {
+    if let ifMatched = context[view]?.ifMatched {
+      context[view]!.append(contentsOf: ifMatched)
+      context[view]!.ifMatched = nil
+    }
+    for view in view.subviews {
+      applyIfMatchedSubviewModifiers(view)
+    }
+  }
 }