@fluentui-react-native/callout 0.24.6 → 0.24.8

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 (17) 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/Callout.types.d.ts.map +1 -1
  7. package/lib/Callout.types.js.map +1 -1
  8. package/lib-commonjs/Callout.d.ts.map +1 -1
  9. package/lib-commonjs/Callout.js +4 -0
  10. package/lib-commonjs/Callout.js.map +1 -1
  11. package/lib-commonjs/Callout.types.d.ts.map +1 -1
  12. package/lib-commonjs/Callout.types.js.map +1 -1
  13. package/macos/CalloutView.swift +9 -11
  14. package/macos/FRNCalloutManager.m +1 -1
  15. package/package.json +1 -1
  16. package/src/Callout.tsx +3 -0
  17. package/src/Callout.types.ts +0 -1
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 17:22:39 GMT",
5
+ "date": "Fri, 14 Jul 2023 23:31:28 GMT",
6
+ "tag": "@fluentui-react-native/callout_v0.24.8",
7
+ "version": "0.24.8",
8
+ "comments": {
9
+ "patch": [
10
+ {
11
+ "author": "email not defined",
12
+ "package": "@fluentui-react-native/callout",
13
+ "commit": "40fafc6d32e9fa3d4d137ec003ac185470a96575",
14
+ "comment": "[Callout] Fix anchor not updating when going from `target` to `anchorRect`"
15
+ }
16
+ ]
17
+ }
18
+ },
19
+ {
20
+ "date": "Mon, 10 Jul 2023 23:39:34 GMT",
21
+ "tag": "@fluentui-react-native/callout_v0.24.7",
22
+ "version": "0.24.7",
23
+ "comments": {
24
+ "patch": [
25
+ {
26
+ "author": "nakambo@microsoft.com",
27
+ "package": "@fluentui-react-native/callout",
28
+ "commit": "204b9178a9dd307b854b3b59fd7d0c1616719a03",
29
+ "comment": "[macOS] [Callout] Fixing anchor rect"
30
+ }
31
+ ]
32
+ }
33
+ },
34
+ {
35
+ "date": "Mon, 10 Jul 2023 17:25:04 GMT",
6
36
  "tag": "@fluentui-react-native/callout_v0.24.6",
7
37
  "version": "0.24.6",
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 17:22:39 GMT and should not be manually modified.
3
+ This log was last generated on Fri, 14 Jul 2023 23:31:28 GMT and should not be manually modified.
4
4
 
5
5
  <!-- Start content -->
6
6
 
7
+ ## 0.24.8
8
+
9
+ Fri, 14 Jul 2023 23:31:28 GMT
10
+
11
+ ### Patches
12
+
13
+ - [Callout] Fix anchor not updating when going from `target` to `anchorRect` (email not defined)
14
+
15
+ ## 0.24.7
16
+
17
+ Mon, 10 Jul 2023 23:39:34 GMT
18
+
19
+ ### Patches
20
+
21
+ - [macOS] [Callout] Fixing anchor rect (nakambo@microsoft.com)
22
+
7
23
  ## 0.24.6
8
24
 
9
- Mon, 10 Jul 2023 17:22:39 GMT
25
+ Mon, 10 Jul 2023 17:25:04 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/Callout.types.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Callout.types.d.ts","sourceRoot":"","sources":["../src/Callout.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,KAAK,MAAM,OAAO,CAAC;AAEpC,OAAO,KAAK,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE/D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AAC3E,OAAO,KAAK,EAAE,sBAAsB,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC3F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AACzE,eAAO,MAAM,WAAW,YAAY,CAAC;AAErC;;GAEG;AAEH,MAAM,MAAM,eAAe,GACvB,aAAa,GACb,YAAY,GACZ,gBAAgB,GAChB,aAAa,GACb,aAAa,GACb,WAAW,GACX,cAAc,GACd,cAAc,GACd,aAAa,GACb,iBAAiB,GACjB,gBAAgB,GAChB,gBAAgB,GAChB,cAAc,GACd,iBAAiB,CAAC;AAEtB,MAAM,MAAM,gBAAgB,GAAG,yBAAyB,GAAG,8BAA8B,CAAC;AAE1F,MAAM,WAAW,iBAAiB;IAChC,WAAW,EAAE;QACX;;WAEG;QACH,aAAa,EAAE,OAAO,CAAC;KACxB,CAAC;CACH;AAED,UAAU,mBAAmB;IAC3B,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC/B,WAAW,CAAC,EAAE,SAAS,CAAC,aAAa,CAAC,CAAC;CACxC;AAED,KAAK,mBAAmB,GAAG,IAAI,CAAC,aAAa,EAAE,MAAM,mBAAmB,CAAC,CAAC;AAE1E,MAAM,WAAW,cAAe,SAAQ,sBAAsB,EAAE,mBAAmB;IACjF;;;OAGG;IACH,UAAU,CAAC,EAAE,eAAe,CAAC;IAE7B;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;OAGG;IACH,eAAe,CAAC,EAAE,eAAe,CAAC;IAElC;;;;;;;;;;;OAWG;IACH,gBAAgB,CAAC,EAAE,gBAAgB,EAAE,CAAC;IAEtC;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAE5B;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAE3B;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAE3B;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,aAAc,SAAQ,UAAU,EAAE,cAAc;IAC/D;;;OAGG;IACH,+BAA+B,CAAC,EAAE,MAAM,CAAC;IAEzC;;OAEG;IACH,YAAY,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IAE3C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA+CG;IACH,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAElC;;;;;OAKG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC;IAEvB;;;;;;;;;;OAUG;IACH,cAAc,CAAC,EAAE,CAAC,iBAAiB,EAAE,iBAAiB,KAAK,IAAI,CAAC;IAEhE;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IAEpB;;;;;;OAMG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B;;;;OAIG;IACH,MAAM,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC;CACpD;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,aAAa,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,WAAW,CAAC,iBAAiB,CAAC,CAAC;AAEhE,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,aAAa,CAAC;IACrB,SAAS,EAAE,iBAAiB,CAAC;IAC7B,MAAM,EAAE,cAAc,CAAC;CACxB"}
1
+ {"version":3,"file":"Callout.types.d.ts","sourceRoot":"","sources":["../src/Callout.types.ts"],"names":[],"mappings":"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"}
package/lib/Callout.types.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Callout.types.js","sourceRoot":"","sources":["../src/Callout.types.ts"],"names":[],"mappings":"AAQA,MAAM,CAAC,IAAM,WAAW,GAAG,SAAS,CAAC"}
1
+ {"version":3,"file":"Callout.types.js","sourceRoot":"","sources":["../src/Callout.types.ts"],"names":[],"mappings":"AAOA,MAAM,CAAC,IAAM,WAAW,GAAG,SAAS,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/lib-commonjs/Callout.types.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Callout.types.d.ts","sourceRoot":"","sources":["../src/Callout.types.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Callout.types.d.ts","sourceRoot":"","sources":["../src/Callout.types.ts"],"names":[],"mappings":"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"}
package/lib-commonjs/Callout.types.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Callout.types.js","sourceRoot":"","sources":["../src/Callout.types.ts"],"names":[],"mappings":";;;AAQa,QAAA,WAAW,GAAG,SAAS,CAAC"}
1
+ {"version":3,"file":"Callout.types.js","sourceRoot":"","sources":["../src/Callout.types.ts"],"names":[],"mappings":";;;AAOa,QAAA,WAAW,GAAG,SAAS,CAAC"}
package/macos/CalloutView.swift CHANGED
@@ -183,7 +183,7 @@ class CalloutView: RCTView, CalloutWindowLifeCycleDelegate {
183
183
  preconditionFailure("No window found")
184
184
  }
185
185
 
186
- guard let screenFrame = window.screen?.visibleFrame ?? NSScreen.main?.visibleFrame else {
186
+ if (window.screen == nil) {
187
187
  preconditionFailure("No screen Available")
188
188
  }
189
189
 
@@ -193,16 +193,14 @@ class CalloutView: RCTView, CalloutWindowLifeCycleDelegate {
193
193
  while (!rootView.isReactRootView()) {
194
194
  rootView = rootView.reactSuperview()
195
195
  }
196
- let rootViewBoundsInWindow = rootView.convert(rootView.bounds, to: nil)
197
- let rootViewRectInScreenCoordinates = window.convertToScreen(rootViewBoundsInWindow)
198
-
199
- // macOS uses a flipped Y coordinate (I.E: (0,0) is on the bottom left of the screen). However,
200
- // React Native assumes a standard Y coordinate. Let's flip the Y coordinate of our rect to match
201
- let anchorScreenRectOrigin = NSPoint(
202
- x: rootViewRectInScreenCoordinates.origin.x + self.anchorRect.origin.x,
203
- y: screenFrame.height - (rootViewRectInScreenCoordinates.origin.y + self.anchorRect.origin.y)
204
- )
205
- let anchorRectInScreenCoordinates = NSRect(origin: anchorScreenRectOrigin, size: anchorRect.size)
196
+
197
+ let anchorRect = self.anchorRect
198
+
199
+ // Since the root view is flipped, we already have anchorRect in the "correct"
200
+ // (i.e. flipped) coordinate space. Since we need to provide screen rects to Apple,
201
+ // we will once again arrive at the "correct" (not flipped) coordinate space.
202
+ let anchorRectInWindow = rootView.convert(anchorRect, to: nil)
203
+ let anchorRectInScreenCoordinates = window.convertToScreen(anchorRectInWindow)
206
204
 
207
205
  return anchorRectInScreenCoordinates
208
206
  }
package/macos/FRNCalloutManager.m CHANGED
@@ -8,7 +8,7 @@
8
8
  + (NSRect)screenRect:(id)json
9
9
  {
10
10
  CGFloat x = [RCTConvert CGFloat:json[@"screenX"]];
11
- CGFloat y = [RCTConvert CGFloat:json[@"screenX"]];
11
+ CGFloat y = [RCTConvert CGFloat:json[@"screenY"]];
12
12
  CGFloat width = [RCTConvert CGFloat:json[@"width"]];
13
13
  CGFloat height = [RCTConvert CGFloat:json[@"height"]];
14
14
  return NSMakeRect(x, y, width, height);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@fluentui-react-native/callout",
3
- "version": "0.24.6",
3
+ "version": "0.24.8",
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
 
package/src/Callout.types.ts CHANGED
@@ -1,5 +1,4 @@
1
1
  import type * as React from 'react';
2
- // SAAD - Looks like ScreenRect got renamed.
3
2
  import type { KeyboardMetrics, ViewStyle } from 'react-native';
4
3
 
5
4
  import type { IViewProps } from '@fluentui-react-native/adapters';