@fluentui-react-native/callout 0.24.7 → 0.24.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. package/CHANGELOG.json +31 -1
  2. package/CHANGELOG.md +18 -2
  3. package/lib/Callout.d.ts.map +1 -1
  4. package/lib/Callout.js +4 -0
  5. package/lib/Callout.js.map +1 -1
  6. package/lib-commonjs/Callout.d.ts.map +1 -1
  7. package/lib-commonjs/Callout.js +4 -0
  8. package/lib-commonjs/Callout.js.map +1 -1
  9. package/macos/CalloutView.swift +12 -5
  10. package/package.json +1 -1
  11. package/src/Callout.tsx +3 -0
package/CHANGELOG.json CHANGED
@@ -2,7 +2,37 @@
2
2
  "name": "@fluentui-react-native/callout",
3
3
  "entries": [
4
4
  {
5
- "date": "Mon, 10 Jul 2023 23:38:49 GMT",
5
+ "date": "Sat, 15 Jul 2023 23:00:36 GMT",
6
+ "tag": "@fluentui-react-native/callout_v0.24.9",
7
+ "version": "0.24.9",
8
+ "comments": {
9
+ "patch": [
10
+ {
11
+ "author": "nakambo@microsoft.com",
12
+ "package": "@fluentui-react-native/callout",
13
+ "commit": "d00b3a1d07d0dc05083e02fd1dcc7e8a264290c9",
14
+ "comment": "[macOS] [FRNCallout] Fix switching betwen `target` and `anchorRect`"
15
+ }
16
+ ]
17
+ }
18
+ },
19
+ {
20
+ "date": "Fri, 14 Jul 2023 23:32:22 GMT",
21
+ "tag": "@fluentui-react-native/callout_v0.24.8",
22
+ "version": "0.24.8",
23
+ "comments": {
24
+ "patch": [
25
+ {
26
+ "author": "email not defined",
27
+ "package": "@fluentui-react-native/callout",
28
+ "commit": "40fafc6d32e9fa3d4d137ec003ac185470a96575",
29
+ "comment": "[Callout] Fix anchor not updating when going from `target` to `anchorRect`"
30
+ }
31
+ ]
32
+ }
33
+ },
34
+ {
35
+ "date": "Mon, 10 Jul 2023 23:39:34 GMT",
6
36
  "tag": "@fluentui-react-native/callout_v0.24.7",
7
37
  "version": "0.24.7",
8
38
  "comments": {
package/CHANGELOG.md CHANGED
@@ -1,12 +1,28 @@
1
1
  # Change Log - @fluentui-react-native/callout
2
2
 
3
- This log was last generated on Mon, 10 Jul 2023 23:38:49 GMT and should not be manually modified.
3
+ This log was last generated on Sat, 15 Jul 2023 23:00:36 GMT and should not be manually modified.
4
4
 
5
5
  <!-- Start content -->
6
6
 
7
+ ## 0.24.9
8
+
9
+ Sat, 15 Jul 2023 23:00:36 GMT
10
+
11
+ ### Patches
12
+
13
+ - [macOS] [FRNCallout] Fix switching betwen `target` and `anchorRect` (nakambo@microsoft.com)
14
+
15
+ ## 0.24.8
16
+
17
+ Fri, 14 Jul 2023 23:32:22 GMT
18
+
19
+ ### Patches
20
+
21
+ - [Callout] Fix anchor not updating when going from `target` to `anchorRect` (email not defined)
22
+
7
23
  ## 0.24.7
8
24
 
9
- Mon, 10 Jul 2023 23:38:49 GMT
25
+ Mon, 10 Jul 2023 23:39:34 GMT
10
26
 
11
27
  ### Patches
12
28
 
package/lib/Callout.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Callout.d.ts","sourceRoot":"","sources":["../src/Callout.tsx"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,aAAa,EAAE,iBAAiB,EAAgB,MAAM,iBAAiB,CAAC;AAQtF,eAAO,MAAM,OAAO,6JAkClB,CAAC;AAEH,eAAe,OAAO,CAAC"}
1
+ {"version":3,"file":"Callout.d.ts","sourceRoot":"","sources":["../src/Callout.tsx"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,aAAa,EAAE,iBAAiB,EAAgB,MAAM,iBAAiB,CAAC;AAQtF,eAAO,MAAM,OAAO,6JAqClB,CAAC;AAEH,eAAe,OAAO,CAAC"}
package/lib/Callout.js CHANGED
@@ -48,6 +48,10 @@ export var Callout = compose({
48
48
  // Pass the tagID for a valid ref `target`
49
49
  setNativeTarget(findNodeHandle(target.current));
50
50
  }
51
+ else {
52
+ // Clear `target` so we may fall back on `anchorRect` if provided
53
+ setNativeTarget(null);
54
+ }
51
55
  }, [target]);
52
56
  var slotProps = mergeSettings(useStyling(props), {
53
57
  root: __assign(__assign({ ref: calloutRef }, (nativeTarget && { target: nativeTarget })), rest),
package/lib/Callout.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Callout.js","sourceRoot":"","sources":["../src/Callout.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAExD,OAAO,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAC;AAC/E,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAC/E,OAAO,EAAE,qBAAqB,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAEpF,OAAO,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AAEpE,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,IAAM,iBAAiB,GAAG,QAAQ,CAAC,MAAM,CAAC;IACxC,KAAK,EAAE,qBAAqB,CAAC,YAAY,CAAC;IAC1C,OAAO,EAAE,qBAAqB,CAAC,YAAY,CAAC,EAAE,QAAQ;CACvD,CAAC,CAAC;AAEH,MAAM,CAAC,IAAM,OAAO,GAAG,OAAO,CAAe;IAC3C,WAAW,EAAE,WAAW;IACxB,eAAe,EAAE,UAAC,KAAoB,EAAE,UAA4C;QAC1E,IAAA,YAAY,GAAsB,KAAK,aAA3B,EAAE,MAAM,GAAc,KAAK,OAAnB,EAAK,IAAI,UAAK,KAAK,EAAzC,0BAAiC,CAAF,CAAW;QAChD,IAAM,UAAU,GAAG,mBAAmB,CAAC,YAAY,CAAC,CAAC;QAC/C,IAAA,KAAkC,KAAK,CAAC,QAAQ,CAAyB,IAAI,CAAC,EAA7E,YAAY,QAAA,EAAE,eAAe,QAAgD,CAAC;QAErF,KAAK,CAAC,eAAe,CAAC;YACpB,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;gBAC9B,qCAAqC;gBACrC,eAAe,CAAC,MAAM,CAAC,CAAC;aACzB;iBAAM,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,EAAE;gBAC1B,0CAA0C;gBAC1C,eAAe,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;aACjD;QACH,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;QAEb,IAAM,SAAS,GAAG,aAAa,CAAoB,UAAU,CAAC,KAAK,CAAC,EAAE;YACpE,IAAI,sBACF,GAAG,EAAE,UAAU,IACZ,CAAC,YAAY,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,GAC1C,IAAI,CACR;SACF,CAAC,CAAC;QAEH,OAAO,EAAE,SAAS,WAAA,EAAE,CAAC;IACvB,CAAC;IACD,QAAQ,EAAE,QAAQ;IAClB,KAAK,EAAE;QACL,IAAI,EAAE,iBAAiB;KACxB;IACD,MAAM,EAAE;QACN,IAAI,EAAE,CAAC,qBAAqB,EAAE,YAAY,CAAC;KAC5C;CACF,CAAC,CAAC;AAEH,eAAe,OAAO,CAAC"}
1
+ {"version":3,"file":"Callout.js","sourceRoot":"","sources":["../src/Callout.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAExD,OAAO,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAC;AAC/E,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAC/E,OAAO,EAAE,qBAAqB,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAEpF,OAAO,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AAEpE,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,IAAM,iBAAiB,GAAG,QAAQ,CAAC,MAAM,CAAC;IACxC,KAAK,EAAE,qBAAqB,CAAC,YAAY,CAAC;IAC1C,OAAO,EAAE,qBAAqB,CAAC,YAAY,CAAC,EAAE,QAAQ;CACvD,CAAC,CAAC;AAEH,MAAM,CAAC,IAAM,OAAO,GAAG,OAAO,CAAe;IAC3C,WAAW,EAAE,WAAW;IACxB,eAAe,EAAE,UAAC,KAAoB,EAAE,UAA4C;QAC1E,IAAA,YAAY,GAAsB,KAAK,aAA3B,EAAE,MAAM,GAAc,KAAK,OAAnB,EAAK,IAAI,UAAK,KAAK,EAAzC,0BAAiC,CAAF,CAAW;QAChD,IAAM,UAAU,GAAG,mBAAmB,CAAC,YAAY,CAAC,CAAC;QAC/C,IAAA,KAAkC,KAAK,CAAC,QAAQ,CAAyB,IAAI,CAAC,EAA7E,YAAY,QAAA,EAAE,eAAe,QAAgD,CAAC;QAErF,KAAK,CAAC,eAAe,CAAC;YACpB,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;gBAC9B,qCAAqC;gBACrC,eAAe,CAAC,MAAM,CAAC,CAAC;aACzB;iBAAM,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,EAAE;gBAC1B,0CAA0C;gBAC1C,eAAe,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;aACjD;iBAAM;gBACL,iEAAiE;gBACjE,eAAe,CAAC,IAAI,CAAC,CAAC;aACvB;QACH,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;QAEb,IAAM,SAAS,GAAG,aAAa,CAAoB,UAAU,CAAC,KAAK,CAAC,EAAE;YACpE,IAAI,sBACF,GAAG,EAAE,UAAU,IACZ,CAAC,YAAY,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,GAC1C,IAAI,CACR;SACF,CAAC,CAAC;QAEH,OAAO,EAAE,SAAS,WAAA,EAAE,CAAC;IACvB,CAAC;IACD,QAAQ,EAAE,QAAQ;IAClB,KAAK,EAAE;QACL,IAAI,EAAE,iBAAiB;KACxB;IACD,MAAM,EAAE;QACN,IAAI,EAAE,CAAC,qBAAqB,EAAE,YAAY,CAAC;KAC5C;CACF,CAAC,CAAC;AAEH,eAAe,OAAO,CAAC"}
package/lib-commonjs/Callout.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Callout.d.ts","sourceRoot":"","sources":["../src/Callout.tsx"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,aAAa,EAAE,iBAAiB,EAAgB,MAAM,iBAAiB,CAAC;AAQtF,eAAO,MAAM,OAAO,6JAkClB,CAAC;AAEH,eAAe,OAAO,CAAC"}
1
+ {"version":3,"file":"Callout.d.ts","sourceRoot":"","sources":["../src/Callout.tsx"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,aAAa,EAAE,iBAAiB,EAAgB,MAAM,iBAAiB,CAAC;AAQtF,eAAO,MAAM,OAAO,6JAqClB,CAAC;AAEH,eAAe,OAAO,CAAC"}
package/lib-commonjs/Callout.js CHANGED
@@ -74,6 +74,10 @@ exports.Callout = (0, foundation_compose_1.compose)({
74
74
  // Pass the tagID for a valid ref `target`
75
75
  setNativeTarget((0, react_native_1.findNodeHandle)(target.current));
76
76
  }
77
+ else {
78
+ // Clear `target` so we may fall back on `anchorRect` if provided
79
+ setNativeTarget(null);
80
+ }
77
81
  }, [target]);
78
82
  var slotProps = (0, foundation_settings_1.mergeSettings)(useStyling(props), {
79
83
  root: __assign(__assign({ ref: calloutRef }, (nativeTarget && { target: nativeTarget })), rest),
package/lib-commonjs/Callout.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Callout.js","sourceRoot":"","sources":["../src/Callout.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA+B;AAC/B,6CAAwD;AAExD,0EAA+E;AAC/E,8EAA+E;AAC/E,wDAAoF;AAEpF,yEAA6D;AAC7D,2EAAoE;AAEpE,uDAA8C;AAE9C,iDAA8C;AAE9C,IAAM,iBAAiB,GAAG,uBAAQ,CAAC,MAAM,CAAC;IACxC,KAAK,EAAE,IAAA,uCAAqB,EAAC,YAAY,CAAC;IAC1C,OAAO,EAAE,IAAA,uCAAqB,EAAC,YAAY,CAAC,EAAE,QAAQ;CACvD,CAAC,CAAC;AAEU,QAAA,OAAO,GAAG,IAAA,4BAAO,EAAe;IAC3C,WAAW,EAAE,2BAAW;IACxB,eAAe,EAAE,UAAC,KAAoB,EAAE,UAA4C;QAC1E,IAAA,YAAY,GAAsB,KAAK,aAA3B,EAAE,MAAM,GAAc,KAAK,OAAnB,EAAK,IAAI,UAAK,KAAK,EAAzC,0BAAiC,CAAF,CAAW;QAChD,IAAM,UAAU,GAAG,IAAA,uCAAmB,EAAC,YAAY,CAAC,CAAC;QAC/C,IAAA,KAAkC,KAAK,CAAC,QAAQ,CAAyB,IAAI,CAAC,EAA7E,YAAY,QAAA,EAAE,eAAe,QAAgD,CAAC;QAErF,KAAK,CAAC,eAAe,CAAC;YACpB,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;gBAC9B,qCAAqC;gBACrC,eAAe,CAAC,MAAM,CAAC,CAAC;aACzB;iBAAM,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,EAAE;gBAC1B,0CAA0C;gBAC1C,eAAe,CAAC,IAAA,6BAAc,EAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;aACjD;QACH,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;QAEb,IAAM,SAAS,GAAG,IAAA,mCAAa,EAAoB,UAAU,CAAC,KAAK,CAAC,EAAE;YACpE,IAAI,sBACF,GAAG,EAAE,UAAU,IACZ,CAAC,YAAY,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,GAC1C,IAAI,CACR;SACF,CAAC,CAAC;QAEH,OAAO,EAAE,SAAS,WAAA,EAAE,CAAC;IACvB,CAAC;IACD,QAAQ,EAAE,2BAAQ;IAClB,KAAK,EAAE;QACL,IAAI,EAAE,iBAAiB;KACxB;IACD,MAAM,EAAE;QACN,IAAI,EAAE,CAAC,8BAAqB,EAAE,qBAAY,CAAC;KAC5C;CACF,CAAC,CAAC;AAEH,kBAAe,eAAO,CAAC"}
1
+ {"version":3,"file":"Callout.js","sourceRoot":"","sources":["../src/Callout.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA+B;AAC/B,6CAAwD;AAExD,0EAA+E;AAC/E,8EAA+E;AAC/E,wDAAoF;AAEpF,yEAA6D;AAC7D,2EAAoE;AAEpE,uDAA8C;AAE9C,iDAA8C;AAE9C,IAAM,iBAAiB,GAAG,uBAAQ,CAAC,MAAM,CAAC;IACxC,KAAK,EAAE,IAAA,uCAAqB,EAAC,YAAY,CAAC;IAC1C,OAAO,EAAE,IAAA,uCAAqB,EAAC,YAAY,CAAC,EAAE,QAAQ;CACvD,CAAC,CAAC;AAEU,QAAA,OAAO,GAAG,IAAA,4BAAO,EAAe;IAC3C,WAAW,EAAE,2BAAW;IACxB,eAAe,EAAE,UAAC,KAAoB,EAAE,UAA4C;QAC1E,IAAA,YAAY,GAAsB,KAAK,aAA3B,EAAE,MAAM,GAAc,KAAK,OAAnB,EAAK,IAAI,UAAK,KAAK,EAAzC,0BAAiC,CAAF,CAAW;QAChD,IAAM,UAAU,GAAG,IAAA,uCAAmB,EAAC,YAAY,CAAC,CAAC;QAC/C,IAAA,KAAkC,KAAK,CAAC,QAAQ,CAAyB,IAAI,CAAC,EAA7E,YAAY,QAAA,EAAE,eAAe,QAAgD,CAAC;QAErF,KAAK,CAAC,eAAe,CAAC;YACpB,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;gBAC9B,qCAAqC;gBACrC,eAAe,CAAC,MAAM,CAAC,CAAC;aACzB;iBAAM,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,EAAE;gBAC1B,0CAA0C;gBAC1C,eAAe,CAAC,IAAA,6BAAc,EAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;aACjD;iBAAM;gBACL,iEAAiE;gBACjE,eAAe,CAAC,IAAI,CAAC,CAAC;aACvB;QACH,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;QAEb,IAAM,SAAS,GAAG,IAAA,mCAAa,EAAoB,UAAU,CAAC,KAAK,CAAC,EAAE;YACpE,IAAI,sBACF,GAAG,EAAE,UAAU,IACZ,CAAC,YAAY,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,GAC1C,IAAI,CACR;SACF,CAAC,CAAC;QAEH,OAAO,EAAE,SAAS,WAAA,EAAE,CAAC;IACvB,CAAC;IACD,QAAQ,EAAE,2BAAQ;IAClB,KAAK,EAAE;QACL,IAAI,EAAE,iBAAiB;KACxB;IACD,MAAM,EAAE;QACN,IAAI,EAAE,CAAC,8BAAqB,EAAE,qBAAY,CAAC;KAC5C;CACF,CAAC,CAAC;AAEH,kBAAe,eAAO,CAAC"}
package/macos/CalloutView.swift CHANGED
@@ -6,8 +6,9 @@ class CalloutView: RCTView, CalloutWindowLifeCycleDelegate {
6
6
 
7
7
  @objc public var target: NSNumber? {
8
8
  didSet {
9
- guard let targetView = bridge?.uiManager.view(forReactTag: target) else {
10
- preconditionFailure("Invalid target react tag")
9
+ let targetView = bridge?.uiManager.view(forReactTag: target)
10
+ if (targetView == nil && target != nil) {
11
+ preconditionFailure("Invalid target")
11
12
  }
12
13
  anchorView = targetView
13
14
  updateCalloutFrameToAnchor()
@@ -169,10 +170,16 @@ class CalloutView: RCTView, CalloutWindowLifeCycleDelegate {
169
170
  return
170
171
  }
171
172
 
172
- // Prefer anchorRect over anchorView if available
173
- let anchorScreenRect = anchorRect.equalTo(.null) ? calculateAnchorViewScreenRect() : calculateAnchorRectScreenRect()
173
+ // Prefer anchorView over anchorRect if available
174
+ let anchorScreenRect = anchorView != nil ? calculateAnchorViewScreenRect() : calculateAnchorRectScreenRect()
174
175
  let calloutScreenRect = bestCalloutRect(relativeTo: anchorScreenRect)
175
176
 
177
+ // Because we immediately update the rect as props come in, there's a possibility that we have neither
178
+ // of anchorRect and target. Don't update until we have at least one.
179
+ guard !calloutScreenRect.isEmpty else {
180
+ return
181
+ }
182
+
176
183
  proxyView.frame.origin = .zero
177
184
  calloutWindow.setFrame(calloutScreenRect, display: false)
178
185
  }
@@ -347,7 +354,7 @@ class CalloutView: RCTView, CalloutWindowLifeCycleDelegate {
347
354
 
348
355
  // MARK: Private variables
349
356
 
350
- /// The view the Callout is presented from, if anchorRect is nil.
357
+ /// The view the Callout is presented from.
351
358
  private var anchorView: NSView?
352
359
 
353
360
  /// The view we forward Callout's Children to. It's hosted within the CalloutWindow's
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@fluentui-react-native/callout",
3
- "version": "0.24.7",
3
+ "version": "0.24.9",
4
4
  "description": "A cross-platform Callout component using the Fluent Design System",
5
5
  "license": "MIT",
6
6
  "author": "",
package/src/Callout.tsx CHANGED
@@ -31,6 +31,9 @@ export const Callout = compose<ICalloutType>({
31
31
  } else if (target?.current) {
32
32
  // Pass the tagID for a valid ref `target`
33
33
  setNativeTarget(findNodeHandle(target.current));
34
+ } else {
35
+ // Clear `target` so we may fall back on `anchorRect` if provided
36
+ setNativeTarget(null);
34
37
  }
35
38
  }, [target]);
36
39