diff --git a/Podfile.lock b/Podfile.lock index 0ffe3a4..6d6b030 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -4,7 +4,7 @@ PODS: - TextureSwiftSupport - Reveal-SDK (27) - Texture/Core (3.0.0) - - TextureSwiftSupport (3.2.0): + - TextureSwiftSupport (3.4.0): - Texture/Core (~> 3) - TypedTextAttributes (1.1.0) @@ -30,7 +30,7 @@ SPEC CHECKSUMS: GlossButtonNode: 0b1471447cb4cebc8a959bbca574247ff6b0592b Reveal-SDK: 306e2880395ee396f5a8b4c485c3a86dd19866c7 Texture: 2f109e937850d94d1d07232041c9c7313ccddb81 - TextureSwiftSupport: 2dfc0320e954f549d941f630843b097ab2abdec2 + TextureSwiftSupport: 9f630cd5056e90991bc0d473a3d77f05a891831c TypedTextAttributes: fc3a5a8c4a7a28304446f8c5e8af146d11c2163a PODFILE CHECKSUM: d0d5117b212f7b612e1da01319d0d50e755c823a diff --git a/TextureSwiftSupport.xcodeproj/xcshareddata/xcschemes/TextureSwiftSupport.xcscheme b/TextureSwiftSupport.xcodeproj/xcshareddata/xcschemes/TextureSwiftSupport.xcscheme new file mode 100644 index 0000000..5a64ba8 --- /dev/null +++ b/TextureSwiftSupport.xcodeproj/xcshareddata/xcschemes/TextureSwiftSupport.xcscheme @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/TextureSwiftSupport/Components/Compositions/HighlightAnimationDescriptor.swift b/TextureSwiftSupport/Components/Compositions/HighlightAnimationDescriptor.swift index 8aa86f3..5a19d79 100644 --- a/TextureSwiftSupport/Components/Compositions/HighlightAnimationDescriptor.swift +++ b/TextureSwiftSupport/Components/Compositions/HighlightAnimationDescriptor.swift @@ -28,8 +28,8 @@ public struct HighlightAnimationDescriptor { _ bodyNode: ASDisplayNode ) -> Void - fileprivate let animation: Block - fileprivate let overlayNode: ASDisplayNode? + let animation: Block + let overlayNode: ASDisplayNode? public init( overlayNode: () -> ASDisplayNode? = { nil }, @@ -60,11 +60,7 @@ extension HighlightAnimationDescriptor { initialSpringVelocity: 0, options: [.beginFromCurrentState, .allowUserInteraction], animations: { - body.transform = .init( - scaleX: shrinkingScale, - y: shrinkingScale, - z: 1 - ) + body.transform = CATransform3DMakeScale(shrinkingScale, shrinkingScale, 1) }, completion: nil ) @@ -76,7 +72,7 @@ extension HighlightAnimationDescriptor { initialSpringVelocity: 0, options: [.beginFromCurrentState, .allowUserInteraction], animations: { - body.transform = .identity + body.transform = CATransform3DIdentity }, completion: nil ) @@ -156,7 +152,7 @@ extension HighlightAnimationDescriptor { ], animations: { containerNode.layer.opacity = 0.98 - containerNode.transform = .init(scaleX: 0.98, y: 0.98, z: 1) + containerNode.transform = CATransform3DMakeScale(0.98, 0.98, 1) body.view.transform = CGAffineTransform(scaleX: 0.98, y: 0.98) }, completion: nil @@ -172,7 +168,7 @@ extension HighlightAnimationDescriptor { ], animations: { containerNode.layer.opacity = 0 - containerNode.transform = .identity + containerNode.transform = CATransform3DIdentity body.view.transform = .identity }, completion: nil diff --git a/TextureSwiftSupport/Components/Compositions/InteractiveNode.swift b/TextureSwiftSupport/Components/Compositions/InteractiveNode.swift index 27bf14a..0394f28 100644 --- a/TextureSwiftSupport/Components/Compositions/InteractiveNode.swift +++ b/TextureSwiftSupport/Components/Compositions/InteractiveNode.swift @@ -36,14 +36,8 @@ open class InteractiveNode: NamedDisplayControlNodeBase { return false } - public var tap: ControlEvent { - return .init(events: _tapRelay) - } - public var longPressGestureRecognizer: UILongPressGestureRecognizer? - private let _tapRelay = PublishRelay() - public var handlers = Handlers() public let overlayNode: ASDisplayNode? @@ -124,7 +118,6 @@ open class InteractiveNode: NamedDisplayControlNodeBase { } @objc private func _touchUpInside(_ gesture: UITapGestureRecognizer) { - _tapRelay.accept(()) handlers.onTap() }