Skip to content

Commit 891da22

Browse files
authored
Merge branch 'master' into dependabot/npm_and_yarn/json5-2.2.3
2 parents 8261d87 + 92c4eb5 commit 891da22

3 files changed

Lines changed: 5 additions & 6 deletions

File tree

ios/RNPencilKit.m

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,7 @@ - (void)layoutSubviews {
7676

7777
- (void)setToolPicker API_AVAILABLE(ios(13)) {
7878
RCTLogInfo(@"[RNPencilKit] creating tool bar!");
79-
UIWindow *window = [[[UIApplication sharedApplication] delegate] window];
80-
self.picker = [PKToolPicker sharedToolPickerForWindow:window];
79+
self.picker = [[PKToolPicker alloc] init];
8180
[self.picker addObserver:self.canvas];
8281
[self.picker setVisible:true forFirstResponder:self.canvas];
8382
[self.canvas becomeFirstResponder];

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "react-native-draw-canvas",
33
"title": "React Native Draw Canvas",
4-
"version": "1.1.4",
4+
"version": "1.2.0",
55
"description": "Cross platform native draw canvas for both iOS and Android",
66
"main": "index.js",
77
"scripts": {

yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2605,9 +2605,9 @@ lodash.throttle@^4.1.1:
26052605
integrity sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ=
26062606

26072607
lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.5, lodash@^4.3.0:
2608-
version "4.17.15"
2609-
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
2610-
integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
2608+
version "4.17.21"
2609+
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
2610+
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
26112611

26122612
log-symbols@^2.2.0:
26132613
version "2.2.0"

0 commit comments

Comments
 (0)