Skip to content
This repository was archived by the owner on Aug 13, 2021. It is now read-only.

Commit e6dfc04

Browse files
author
Jeff Verkoeyen
committed
Merge branch 'release-candidate' into stable
2 parents 959ecd2 + 03ec0f7 commit e6dfc04

File tree

5 files changed

+18
-6
lines changed

5 files changed

+18
-6
lines changed

.jazzy.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
module: MaterialMotion
2-
module_version: 1.2.0
2+
module_version: 1.2.1
33
sdk: iphonesimulator
44
xcodebuild_arguments:
55
- -workspace
66
- MaterialMotion.xcworkspace
77
- -scheme
88
- MaterialMotion
99
github_url: https://github.com/material-motion/material-motion-swift
10-
github_file_prefix: https://github.com/material-motion/material-motion-swift/tree/v1.2.0
10+
github_file_prefix: https://github.com/material-motion/material-motion-swift/tree/v1.2.1

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
# 1.2.1
2+
3+
This is a patch release resolving a crashing bug when `runtime.shouldVisualizeMotion` was enabled and an `ArcMove` interaction was added to a view without a parent.
4+
5+
## Source changes
6+
7+
* [Use a reasonable fallback when adding visualization views to the runtime container view.](https://github.com/material-motion/reactive-motion-swift/commit/efc790a13783f54ff583296a2a7245597c2dbee2) (Jeff Verkoeyen)
8+
19
# 1.2.0
210

311
This minor release introduces a new operator, `startWith`, which is meant to replace the `initialValue` operator.

MaterialMotion.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22
s.name = "MaterialMotion"
33
s.summary = "Reactive motion driven by Core Animation."
4-
s.version = "1.2.0"
4+
s.version = "1.2.1"
55
s.authors = "The Material Motion Authors"
66
s.license = "Apache 2.0"
77
s.homepage = "https://github.com/material-motion/material-motion-swift"

Podfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ PODS:
33
- IndefiniteObservable (3.1.0):
44
- IndefiniteObservable/lib (= 3.1.0)
55
- IndefiniteObservable/lib (3.1.0)
6-
- MaterialMotion (1.2.0):
6+
- MaterialMotion (1.2.1):
77
- IndefiniteObservable (~> 3.0)
88

99
DEPENDENCIES:
@@ -17,7 +17,7 @@ EXTERNAL SOURCES:
1717
SPEC CHECKSUMS:
1818
CatalogByConvention: be55c2263132e4f9f59299ac8a528ee8715b3275
1919
IndefiniteObservable: 2789d61f487d8d37fa2b9c3153cc44d4447ff744
20-
MaterialMotion: 4a4f155a35fce5e1dad7cc838719ef1c9c590dc6
20+
MaterialMotion: 599cd0743c60cdb62d7bae2b25bebbc77f6cd9b5
2121

2222
PODFILE CHECKSUM: f503265a0d60526a0d28c96dd4bdcfb40fb562fc
2323

src/reactivetypes/ReactiveCALayer.swift

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,11 @@ public func createCoreAnimationProperty<T>(_ name: String, initialValue: T, exte
279279
lastView.removeFromSuperview()
280280
}
281281
view.isUserInteractionEnabled = false
282-
view.frame = layer.superlayer!.convert(layer.superlayer!.bounds, to: containerView.layer)
282+
if let superlayer = layer.superlayer {
283+
view.frame = superlayer.convert(superlayer.bounds, to: containerView.layer)
284+
} else {
285+
view.frame = containerView.bounds
286+
}
283287
containerView.addSubview(view)
284288
lastView = view
285289
}

0 commit comments

Comments
 (0)