@microsoft/live-share-react 2.0.0-internal.2 → 2.0.0-internal.20

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 (252) hide show
  1. package/LICENSE +64 -61
  2. package/README.md +175 -164
  3. package/bin/esm/index.d.ts +7 -0
  4. package/bin/esm/index.d.ts.map +1 -0
  5. package/bin/esm/index.js +7 -0
  6. package/bin/esm/index.js.map +1 -0
  7. package/bin/esm/interfaces/LiveInterfaceExtensions.d.ts.map +1 -0
  8. package/bin/esm/interfaces/LiveInterfaceExtensions.js.map +1 -0
  9. package/bin/esm/interfaces/index.d.ts +2 -0
  10. package/bin/esm/interfaces/index.d.ts.map +1 -0
  11. package/bin/esm/interfaces/index.js +2 -0
  12. package/bin/esm/interfaces/index.js.map +1 -0
  13. package/bin/esm/internal/errors.d.ts.map +1 -0
  14. package/bin/esm/internal/errors.js.map +1 -0
  15. package/bin/esm/internal/index.d.ts +3 -0
  16. package/bin/esm/internal/index.d.ts.map +1 -0
  17. package/bin/esm/internal/index.js +3 -0
  18. package/bin/esm/internal/index.js.map +1 -0
  19. package/bin/{internal → esm/internal}/type-guards.d.ts +1 -1
  20. package/bin/esm/internal/type-guards.d.ts.map +1 -0
  21. package/bin/esm/internal/type-guards.js.map +1 -0
  22. package/bin/esm/live-hooks/index.d.ts +8 -0
  23. package/bin/esm/live-hooks/index.d.ts.map +1 -0
  24. package/bin/esm/live-hooks/index.js +8 -0
  25. package/bin/esm/live-hooks/index.js.map +1 -0
  26. package/bin/esm/live-hooks/useLiveCanvas.d.ts +80 -0
  27. package/bin/esm/live-hooks/useLiveCanvas.d.ts.map +1 -0
  28. package/bin/esm/live-hooks/useLiveCanvas.js +237 -0
  29. package/bin/esm/live-hooks/useLiveCanvas.js.map +1 -0
  30. package/bin/{live-hooks → esm/live-hooks}/useLiveEvent.d.ts +37 -1
  31. package/bin/esm/live-hooks/useLiveEvent.d.ts.map +1 -0
  32. package/bin/{live-hooks → esm/live-hooks}/useLiveEvent.js +45 -18
  33. package/bin/esm/live-hooks/useLiveEvent.js.map +1 -0
  34. package/bin/esm/live-hooks/useLiveFollowMode.d.ts +163 -0
  35. package/bin/esm/live-hooks/useLiveFollowMode.d.ts.map +1 -0
  36. package/bin/{live-hooks → esm/live-hooks}/useLiveFollowMode.js +173 -39
  37. package/bin/esm/live-hooks/useLiveFollowMode.js.map +1 -0
  38. package/bin/esm/live-hooks/useLivePresence.d.ts +76 -0
  39. package/bin/esm/live-hooks/useLivePresence.d.ts.map +1 -0
  40. package/bin/{live-hooks → esm/live-hooks}/useLivePresence.js +74 -25
  41. package/bin/esm/live-hooks/useLivePresence.js.map +1 -0
  42. package/bin/{live-hooks → esm/live-hooks}/useLiveState.d.ts +46 -1
  43. package/bin/esm/live-hooks/useLiveState.d.ts.map +1 -0
  44. package/bin/{live-hooks → esm/live-hooks}/useLiveState.js +58 -18
  45. package/bin/esm/live-hooks/useLiveState.js.map +1 -0
  46. package/bin/{live-hooks → esm/live-hooks}/useLiveTimer.d.ts +56 -1
  47. package/bin/esm/live-hooks/useLiveTimer.d.ts.map +1 -0
  48. package/bin/{live-hooks → esm/live-hooks}/useLiveTimer.js +80 -34
  49. package/bin/esm/live-hooks/useLiveTimer.js.map +1 -0
  50. package/bin/esm/live-hooks/useMediaSynchronizer.d.ts +86 -0
  51. package/bin/esm/live-hooks/useMediaSynchronizer.d.ts.map +1 -0
  52. package/bin/{live-hooks → esm/live-hooks}/useMediaSynchronizer.js +89 -37
  53. package/bin/esm/live-hooks/useMediaSynchronizer.js.map +1 -0
  54. package/bin/{providers → esm/providers}/AzureProvider.d.ts +9 -9
  55. package/bin/esm/providers/AzureProvider.d.ts.map +1 -0
  56. package/bin/{providers → esm/providers}/AzureProvider.js +28 -33
  57. package/bin/esm/providers/AzureProvider.js.map +1 -0
  58. package/bin/{providers → esm/providers}/LiveShareProvider.d.ts +106 -4
  59. package/bin/esm/providers/LiveShareProvider.d.ts.map +1 -0
  60. package/bin/esm/providers/LiveShareProvider.js +196 -0
  61. package/bin/esm/providers/LiveShareProvider.js.map +1 -0
  62. package/bin/esm/providers/index.d.ts +3 -0
  63. package/bin/esm/providers/index.d.ts.map +1 -0
  64. package/bin/esm/providers/index.js +3 -0
  65. package/bin/esm/providers/index.js.map +1 -0
  66. package/bin/esm/shared-hooks/index.d.ts +7 -0
  67. package/bin/esm/shared-hooks/index.d.ts.map +1 -0
  68. package/bin/esm/shared-hooks/index.js +7 -0
  69. package/bin/esm/shared-hooks/index.js.map +1 -0
  70. package/bin/esm/shared-hooks/internals/tree-node-constants.d.ts +3 -0
  71. package/bin/esm/shared-hooks/internals/tree-node-constants.d.ts.map +1 -0
  72. package/bin/esm/shared-hooks/internals/tree-node-constants.js +3 -0
  73. package/bin/esm/shared-hooks/internals/tree-node-constants.js.map +1 -0
  74. package/bin/esm/shared-hooks/internals/tree-node-types.d.ts +10 -0
  75. package/bin/esm/shared-hooks/internals/tree-node-types.d.ts.map +1 -0
  76. package/bin/esm/shared-hooks/internals/tree-node-types.js +18 -0
  77. package/bin/esm/shared-hooks/internals/tree-node-types.js.map +1 -0
  78. package/bin/esm/shared-hooks/internals/tree-node-utils.d.ts +33 -0
  79. package/bin/esm/shared-hooks/internals/tree-node-utils.d.ts.map +1 -0
  80. package/bin/esm/shared-hooks/internals/tree-node-utils.js +186 -0
  81. package/bin/esm/shared-hooks/internals/tree-node-utils.js.map +1 -0
  82. package/bin/{shared-hooks → esm/shared-hooks}/useDynamicDDS.d.ts +4 -4
  83. package/bin/esm/shared-hooks/useDynamicDDS.d.ts.map +1 -0
  84. package/bin/{shared-hooks → esm/shared-hooks}/useDynamicDDS.js +22 -22
  85. package/bin/esm/shared-hooks/useDynamicDDS.js.map +1 -0
  86. package/bin/{shared-hooks → esm/shared-hooks}/useSharedMap.d.ts +4 -2
  87. package/bin/esm/shared-hooks/useSharedMap.d.ts.map +1 -0
  88. package/bin/{shared-hooks → esm/shared-hooks}/useSharedMap.js +28 -14
  89. package/bin/esm/shared-hooks/useSharedMap.js.map +1 -0
  90. package/bin/{shared-hooks → esm/shared-hooks}/useSharedState.d.ts +1 -1
  91. package/bin/esm/shared-hooks/useSharedState.d.ts.map +1 -0
  92. package/bin/{shared-hooks → esm/shared-hooks}/useSharedState.js +2 -2
  93. package/bin/esm/shared-hooks/useSharedState.js.map +1 -0
  94. package/bin/{shared-hooks → esm/shared-hooks}/useSharedStateRegistry.d.ts +1 -1
  95. package/bin/esm/shared-hooks/useSharedStateRegistry.d.ts.map +1 -0
  96. package/bin/{shared-hooks → esm/shared-hooks}/useSharedStateRegistry.js +35 -24
  97. package/bin/esm/shared-hooks/useSharedStateRegistry.js.map +1 -0
  98. package/bin/esm/shared-hooks/useSharedTree.d.ts +57 -0
  99. package/bin/esm/shared-hooks/useSharedTree.d.ts.map +1 -0
  100. package/bin/esm/shared-hooks/useSharedTree.js +117 -0
  101. package/bin/esm/shared-hooks/useSharedTree.js.map +1 -0
  102. package/bin/esm/shared-hooks/useTreeNode.d.ts +96 -0
  103. package/bin/esm/shared-hooks/useTreeNode.d.ts.map +1 -0
  104. package/bin/esm/shared-hooks/useTreeNode.js +132 -0
  105. package/bin/esm/shared-hooks/useTreeNode.js.map +1 -0
  106. package/bin/{types → esm/types}/ActionTypes.d.ts +7 -7
  107. package/bin/esm/types/ActionTypes.d.ts.map +1 -0
  108. package/bin/esm/types/ActionTypes.js.map +1 -0
  109. package/bin/esm/types/FluidMap.d.ts +151 -0
  110. package/bin/esm/types/FluidMap.d.ts.map +1 -0
  111. package/bin/esm/types/FluidMap.js +24 -0
  112. package/bin/esm/types/FluidMap.js.map +1 -0
  113. package/bin/esm/types/PropTypes.d.ts +56 -0
  114. package/bin/esm/types/PropTypes.d.ts.map +1 -0
  115. package/bin/esm/types/PropTypes.js.map +1 -0
  116. package/bin/{types → esm/types}/ResultTypes.d.ts +62 -18
  117. package/bin/esm/types/ResultTypes.d.ts.map +1 -0
  118. package/bin/esm/types/ResultTypes.js.map +1 -0
  119. package/bin/esm/types/index.d.ts +4 -0
  120. package/bin/esm/types/index.d.ts.map +1 -0
  121. package/bin/esm/types/index.js +4 -0
  122. package/bin/esm/types/index.js.map +1 -0
  123. package/bin/esm/utils/index.d.ts +2 -0
  124. package/bin/esm/utils/index.d.ts.map +1 -0
  125. package/bin/esm/utils/index.js +2 -0
  126. package/bin/esm/utils/index.js.map +1 -0
  127. package/bin/esm/utils/type-check.d.ts.map +1 -0
  128. package/bin/{utils → esm/utils}/type-check.js +1 -1
  129. package/bin/esm/utils/type-check.js.map +1 -0
  130. package/package.json +51 -47
  131. package/src/index.ts +6 -6
  132. package/src/interfaces/index.ts +1 -1
  133. package/src/internal/index.ts +2 -2
  134. package/src/internal/type-guards.ts +1 -1
  135. package/src/live-hooks/index.ts +7 -7
  136. package/src/live-hooks/useLiveCanvas.ts +154 -82
  137. package/src/live-hooks/useLiveEvent.ts +43 -7
  138. package/src/live-hooks/useLiveFollowMode.ts +149 -6
  139. package/src/live-hooks/useLivePresence.ts +80 -17
  140. package/src/live-hooks/useLiveState.ts +54 -6
  141. package/src/live-hooks/useLiveTimer.ts +59 -4
  142. package/src/live-hooks/useMediaSynchronizer.ts +71 -6
  143. package/src/providers/AzureProvider.tsx +21 -21
  144. package/src/providers/LiveShareProvider.tsx +115 -13
  145. package/src/providers/index.ts +2 -2
  146. package/src/shared-hooks/index.ts +6 -4
  147. package/src/shared-hooks/internals/tree-node-constants.ts +2 -0
  148. package/src/shared-hooks/internals/tree-node-types.ts +26 -0
  149. package/src/shared-hooks/internals/tree-node-utils.ts +269 -0
  150. package/src/shared-hooks/useDynamicDDS.ts +28 -17
  151. package/src/shared-hooks/useSharedMap.ts +42 -17
  152. package/src/shared-hooks/useSharedState.ts +6 -3
  153. package/src/shared-hooks/useSharedStateRegistry.ts +44 -22
  154. package/src/shared-hooks/useSharedTree.ts +144 -0
  155. package/src/shared-hooks/useTreeNode.ts +147 -0
  156. package/src/types/ActionTypes.ts +13 -9
  157. package/src/types/FluidMap.ts +169 -0
  158. package/src/types/PropTypes.ts +57 -0
  159. package/src/types/ResultTypes.ts +88 -17
  160. package/src/types/index.ts +3 -3
  161. package/src/utils/index.ts +1 -1
  162. package/tsconfig.json +64 -70
  163. package/.nycrc.json +0 -10
  164. package/bin/index.d.ts +0 -7
  165. package/bin/index.d.ts.map +0 -1
  166. package/bin/index.js +0 -7
  167. package/bin/index.js.map +0 -1
  168. package/bin/interfaces/LiveInterfaceExtensions.d.ts.map +0 -1
  169. package/bin/interfaces/LiveInterfaceExtensions.js.map +0 -1
  170. package/bin/interfaces/index.d.ts +0 -2
  171. package/bin/interfaces/index.d.ts.map +0 -1
  172. package/bin/interfaces/index.js +0 -2
  173. package/bin/interfaces/index.js.map +0 -1
  174. package/bin/internal/errors.d.ts.map +0 -1
  175. package/bin/internal/errors.js.map +0 -1
  176. package/bin/internal/index.d.ts +0 -3
  177. package/bin/internal/index.d.ts.map +0 -1
  178. package/bin/internal/index.js +0 -3
  179. package/bin/internal/index.js.map +0 -1
  180. package/bin/internal/type-guards.d.ts.map +0 -1
  181. package/bin/internal/type-guards.js.map +0 -1
  182. package/bin/live-hooks/index.d.ts +0 -8
  183. package/bin/live-hooks/index.d.ts.map +0 -1
  184. package/bin/live-hooks/index.js +0 -8
  185. package/bin/live-hooks/index.js.map +0 -1
  186. package/bin/live-hooks/useLiveCanvas.d.ts +0 -29
  187. package/bin/live-hooks/useLiveCanvas.d.ts.map +0 -1
  188. package/bin/live-hooks/useLiveCanvas.js +0 -160
  189. package/bin/live-hooks/useLiveCanvas.js.map +0 -1
  190. package/bin/live-hooks/useLiveEvent.d.ts.map +0 -1
  191. package/bin/live-hooks/useLiveEvent.js.map +0 -1
  192. package/bin/live-hooks/useLiveFollowMode.d.ts +0 -24
  193. package/bin/live-hooks/useLiveFollowMode.d.ts.map +0 -1
  194. package/bin/live-hooks/useLiveFollowMode.js.map +0 -1
  195. package/bin/live-hooks/useLivePresence.d.ts +0 -26
  196. package/bin/live-hooks/useLivePresence.d.ts.map +0 -1
  197. package/bin/live-hooks/useLivePresence.js.map +0 -1
  198. package/bin/live-hooks/useLiveState.d.ts.map +0 -1
  199. package/bin/live-hooks/useLiveState.js.map +0 -1
  200. package/bin/live-hooks/useLiveTimer.d.ts.map +0 -1
  201. package/bin/live-hooks/useLiveTimer.js.map +0 -1
  202. package/bin/live-hooks/useMediaSynchronizer.d.ts +0 -25
  203. package/bin/live-hooks/useMediaSynchronizer.d.ts.map +0 -1
  204. package/bin/live-hooks/useMediaSynchronizer.js.map +0 -1
  205. package/bin/providers/AzureProvider.d.ts.map +0 -1
  206. package/bin/providers/AzureProvider.js.map +0 -1
  207. package/bin/providers/LiveShareProvider.d.ts.map +0 -1
  208. package/bin/providers/LiveShareProvider.js +0 -95
  209. package/bin/providers/LiveShareProvider.js.map +0 -1
  210. package/bin/providers/index.d.ts +0 -3
  211. package/bin/providers/index.d.ts.map +0 -1
  212. package/bin/providers/index.js +0 -3
  213. package/bin/providers/index.js.map +0 -1
  214. package/bin/shared-hooks/index.d.ts +0 -5
  215. package/bin/shared-hooks/index.d.ts.map +0 -1
  216. package/bin/shared-hooks/index.js +0 -5
  217. package/bin/shared-hooks/index.js.map +0 -1
  218. package/bin/shared-hooks/useDynamicDDS.d.ts.map +0 -1
  219. package/bin/shared-hooks/useDynamicDDS.js.map +0 -1
  220. package/bin/shared-hooks/useSharedMap.d.ts.map +0 -1
  221. package/bin/shared-hooks/useSharedMap.js.map +0 -1
  222. package/bin/shared-hooks/useSharedState.d.ts.map +0 -1
  223. package/bin/shared-hooks/useSharedState.js.map +0 -1
  224. package/bin/shared-hooks/useSharedStateRegistry.d.ts.map +0 -1
  225. package/bin/shared-hooks/useSharedStateRegistry.js.map +0 -1
  226. package/bin/types/ActionTypes.d.ts.map +0 -1
  227. package/bin/types/ActionTypes.js.map +0 -1
  228. package/bin/types/PropTypes.d.ts +0 -8
  229. package/bin/types/PropTypes.d.ts.map +0 -1
  230. package/bin/types/PropTypes.js.map +0 -1
  231. package/bin/types/ResultTypes.d.ts.map +0 -1
  232. package/bin/types/ResultTypes.js.map +0 -1
  233. package/bin/types/index.d.ts +0 -4
  234. package/bin/types/index.d.ts.map +0 -1
  235. package/bin/types/index.js +0 -4
  236. package/bin/types/index.js.map +0 -1
  237. package/bin/utils/index.d.ts +0 -2
  238. package/bin/utils/index.d.ts.map +0 -1
  239. package/bin/utils/index.js +0 -2
  240. package/bin/utils/index.js.map +0 -1
  241. package/bin/utils/type-check.d.ts.map +0 -1
  242. package/bin/utils/type-check.js.map +0 -1
  243. package/tsconfig.build.json +0 -6
  244. /package/bin/{interfaces → esm/interfaces}/LiveInterfaceExtensions.d.ts +0 -0
  245. /package/bin/{interfaces → esm/interfaces}/LiveInterfaceExtensions.js +0 -0
  246. /package/bin/{internal → esm/internal}/errors.d.ts +0 -0
  247. /package/bin/{internal → esm/internal}/errors.js +0 -0
  248. /package/bin/{internal → esm/internal}/type-guards.js +0 -0
  249. /package/bin/{types → esm/types}/ActionTypes.js +0 -0
  250. /package/bin/{types → esm/types}/PropTypes.js +0 -0
  251. /package/bin/{types → esm/types}/ResultTypes.js +0 -0
  252. /package/bin/{utils → esm/utils}/type-check.d.ts +0 -0
@@ -2,22 +2,13 @@
2
2
  * Copyright (c) Microsoft Corporation. All rights reserved.
3
3
  * Licensed under the Microsoft Live Share SDK License.
4
4
  */
5
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
6
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
7
- return new (P || (P = Promise))(function (resolve, reject) {
8
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
9
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
10
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
11
- step((generator = generator.apply(thisArg, _arguments || [])).next());
12
- });
13
- };
14
5
  import { LiveDataObjectInitializeState, } from "@microsoft/live-share";
15
6
  import React from "react";
16
7
  import { LiveMediaSession, } from "@microsoft/live-share-media";
17
- import { isExtendedMediaMetadata, isMediaElement, isRefObject } from "../utils";
18
- import { useDynamicDDS } from "../shared-hooks";
19
- import { useFluidObjectsContext } from "../providers";
20
- import { ActionContainerNotJoinedError, ActionLiveDataObjectUndefinedError, } from "../internal";
8
+ import { isExtendedMediaMetadata, isMediaElement, isRefObject, } from "../utils/index.js";
9
+ import { useDynamicDDS } from "../shared-hooks/index.js";
10
+ import { useFluidObjectsContext } from "../providers/index.js";
11
+ import { ActionContainerNotJoinedError, ActionLiveDataObjectUndefinedError, } from "../internal/index.js";
21
12
  /**
22
13
  * React hook for using a Live Share media `MediaPlayerSynchronizer`.
23
14
  *
@@ -32,6 +23,67 @@ import { ActionContainerNotJoinedError, ActionLiveDataObjectUndefinedError, } fr
32
23
  * @param viewOnly Optional. Flag for whether or not the media synchronizer should be in viewOnly mode.
33
24
  * @param canSendPositionUpdates Optional. Controls whether or not the local client is allowed to send position updates to the group.
34
25
  * @returns IUseMediaSynchronizerResults object.
26
+ *
27
+ * @example
28
+ ```jsx
29
+ import { useMediaSynchronizer } from "@microsoft/live-share-react";
30
+ import { UserMeetingRole } from "@microsoft/live-share";
31
+ import { MediaPlayerSynchronizerEvents } from "@microsoft/live-share-media";
32
+ import { useRef, useEffect } from "react";
33
+
34
+ const ALLOWED_ROLES = [UserMeetingRole.organizer, UserMeetingRole.presenter];
35
+
36
+ const INITIAL_TRACK = "<YOUR_VIDEO_URL>";
37
+
38
+ // Define a unique key that distinguishes this `useMediaSynchronizer` from others in your app
39
+ const UNIQUE_KEY = "MEDIA-SESSION-ID";
40
+
41
+ export function VideoPlayer() {
42
+ const videoRef = useRef(null);
43
+ const { play, pause, seekTo, mediaSynchronizer } = useMediaSynchronizer(
44
+ UNIQUE_KEY,
45
+ videoRef,
46
+ INITIAL_TRACK,
47
+ ALLOWED_ROLES
48
+ );
49
+
50
+ // Listen for groupaction events (optional)
51
+ useEffect(() => {
52
+ // Listen for player group actions for errors (e.g., play error)
53
+ const onGroupAction = (evt: IMediaPlayerSynchronizerEvent) => {
54
+ // See which user made the change (e.g., to display a notification)
55
+ const clientInfo = await synchronizer.mediaSession.getClientInfo(evt.details.clientId);
56
+ };
57
+ mediaSynchronizer?.addEventListener(
58
+ MediaPlayerSynchronizerEvents.groupaction,
59
+ onGroupAction
60
+ );
61
+ return () => {
62
+ mediaSynchronizer?.removeEventListener(
63
+ MediaPlayerSynchronizerEvents.groupaction,
64
+ onGroupAction
65
+ );
66
+ };
67
+ }, [mediaSynchronizer]);
68
+
69
+ return (
70
+ <div>
71
+ <video ref={videoRef} />
72
+ <button onClick={play}>
73
+ Play
74
+ </button>
75
+ <button onClick={pause}>
76
+ Pause
77
+ </button>
78
+ <button onClick={() => {
79
+ seekTo(0);
80
+ }}>
81
+ Start over
82
+ </button>
83
+ </div>
84
+ );
85
+ }
86
+ ```
35
87
  */
36
88
  export function useMediaSynchronizer(uniqueKey, mediaPlayerElement, initialTrack, allowedRoles, viewOnly, canSendPositionUpdates) {
37
89
  /**
@@ -50,43 +102,43 @@ export function useMediaSynchronizer(uniqueKey, mediaPlayerElement, initialTrack
50
102
  /**
51
103
  * Play callback
52
104
  */
53
- const play = React.useCallback(() => __awaiter(this, void 0, void 0, function* () {
105
+ const play = React.useCallback(async () => {
54
106
  if (!container) {
55
107
  throw new ActionContainerNotJoinedError("mediaSynchronizer", "play");
56
108
  }
57
109
  if (mediaSynchronizer === undefined) {
58
110
  throw new ActionLiveDataObjectUndefinedError("mediaSynchronizer", "play");
59
111
  }
60
- return yield mediaSynchronizer.play();
61
- }), [container, mediaSynchronizer]);
112
+ return await mediaSynchronizer.play();
113
+ }, [container, mediaSynchronizer]);
62
114
  /**
63
115
  * Pause callback
64
116
  */
65
- const pause = React.useCallback(() => __awaiter(this, void 0, void 0, function* () {
117
+ const pause = React.useCallback(async () => {
66
118
  if (!container) {
67
119
  throw new ActionContainerNotJoinedError("mediaSynchronizer", "pause");
68
120
  }
69
121
  if (mediaSynchronizer === undefined) {
70
122
  throw new ActionLiveDataObjectUndefinedError("mediaSynchronizer", "pause");
71
123
  }
72
- return yield mediaSynchronizer.pause();
73
- }), [container, mediaSynchronizer]);
124
+ return await mediaSynchronizer.pause();
125
+ }, [container, mediaSynchronizer]);
74
126
  /**
75
127
  * User facing: seek callback
76
128
  */
77
- const seekTo = React.useCallback((time) => __awaiter(this, void 0, void 0, function* () {
129
+ const seekTo = React.useCallback(async (time) => {
78
130
  if (!container) {
79
131
  throw new ActionContainerNotJoinedError("mediaSynchronizer", "seekTo");
80
132
  }
81
133
  if (mediaSynchronizer === undefined) {
82
134
  throw new ActionLiveDataObjectUndefinedError("mediaSynchronizer", "seekTo");
83
135
  }
84
- return yield mediaSynchronizer.seekTo(time);
85
- }), [container, mediaSynchronizer]);
136
+ return await mediaSynchronizer.seekTo(time);
137
+ }, [container, mediaSynchronizer]);
86
138
  /**
87
139
  * User facing: set track callback
88
140
  */
89
- const setTrack = React.useCallback((track) => __awaiter(this, void 0, void 0, function* () {
141
+ const setTrack = React.useCallback(async (track) => {
90
142
  if (!container) {
91
143
  throw new ActionContainerNotJoinedError("mediaSynchronizer", "setTrack");
92
144
  }
@@ -94,26 +146,26 @@ export function useMediaSynchronizer(uniqueKey, mediaPlayerElement, initialTrack
94
146
  throw new ActionLiveDataObjectUndefinedError("mediaSynchronizer", "setTrack");
95
147
  }
96
148
  if (isExtendedMediaMetadata(track)) {
97
- return yield mediaSynchronizer.setTrack(track);
149
+ return await mediaSynchronizer.setTrack(track);
98
150
  }
99
151
  else if (typeof track === "string") {
100
- return yield mediaSynchronizer.setTrack({
152
+ return await mediaSynchronizer.setTrack({
101
153
  trackIdentifier: track,
102
154
  });
103
155
  }
104
- }), [container, mediaSynchronizer]);
156
+ }, [container, mediaSynchronizer]);
105
157
  /**
106
158
  * User facing: create a new suspension and set it locally to state
107
159
  */
108
160
  const beginSuspension = React.useCallback((waitPoint) => {
109
- const suspension = mediaSession === null || mediaSession === void 0 ? void 0 : mediaSession.coordinator.beginSuspension(waitPoint);
161
+ const suspension = mediaSession?.coordinator.beginSuspension(waitPoint);
110
162
  setSuspension(suspension);
111
163
  }, [mediaSession]);
112
164
  /**
113
165
  * User facing: if a suspension is active, end it. Called when "Follow presenter" button is clicked.
114
166
  */
115
167
  const endSuspension = React.useCallback(() => {
116
- suspension === null || suspension === void 0 ? void 0 : suspension.end();
168
+ suspension?.end();
117
169
  setSuspension(undefined);
118
170
  }, [suspension]);
119
171
  /**
@@ -161,18 +213,18 @@ export function useMediaSynchronizer(uniqueKey, mediaPlayerElement, initialTrack
161
213
  if (mediaSession.initializeState ===
162
214
  LiveDataObjectInitializeState.needed) {
163
215
  // Start synchronizing the media session
164
- mediaSession.initialize(allowedRoles !== null && allowedRoles !== void 0 ? allowedRoles : []);
216
+ mediaSession.initialize(allowedRoles ?? []);
165
217
  }
166
218
  else if (initialTrack) {
167
- mediaSession.onLocalUserAllowed(() => __awaiter(this, void 0, void 0, function* () {
219
+ mediaSession.onLocalUserAllowed(async () => {
168
220
  if (!mounted)
169
221
  return;
170
222
  try {
171
223
  if (isExtendedMediaMetadata(initialTrack)) {
172
- yield synchronizer.setTrack(initialTrack);
224
+ await synchronizer.setTrack(initialTrack);
173
225
  }
174
226
  else if (typeof initialTrack === "string") {
175
- yield synchronizer.setTrack({
227
+ await synchronizer.setTrack({
176
228
  trackIdentifier: initialTrack,
177
229
  });
178
230
  }
@@ -180,15 +232,15 @@ export function useMediaSynchronizer(uniqueKey, mediaPlayerElement, initialTrack
180
232
  catch (err) {
181
233
  console.error(err);
182
234
  }
183
- }));
235
+ });
184
236
  }
185
237
  setMediaSynchronizer(synchronizer);
186
238
  return () => {
187
239
  mounted = false;
188
240
  synchronizer.removeAllListeners();
189
241
  mediaSession.removeAllListeners();
190
- synchronizer === null || synchronizer === void 0 ? void 0 : synchronizer.end();
191
- // mediaSession?.dispose();
242
+ synchronizer?.end();
243
+ mediaSession?.dispose();
192
244
  };
193
245
  }, [mediaSession, mediaPlayerElement]);
194
246
  /**
@@ -202,7 +254,7 @@ export function useMediaSynchronizer(uniqueKey, mediaPlayerElement, initialTrack
202
254
  if (mediaSynchronizer.viewOnly === viewOnly)
203
255
  return;
204
256
  mediaSynchronizer.viewOnly = viewOnly;
205
- }, [viewOnly, mediaSynchronizer === null || mediaSynchronizer === void 0 ? void 0 : mediaSynchronizer.viewOnly]);
257
+ }, [viewOnly, mediaSynchronizer?.viewOnly]);
206
258
  /**
207
259
  * Change canSendPositionUpdates when prop changes
208
260
  */
@@ -218,7 +270,7 @@ export function useMediaSynchronizer(uniqueKey, mediaPlayerElement, initialTrack
218
270
  canSendPositionUpdates;
219
271
  }, [
220
272
  canSendPositionUpdates,
221
- mediaSynchronizer === null || mediaSynchronizer === void 0 ? void 0 : mediaSynchronizer.mediaSession.coordinator.canSendPositionUpdates,
273
+ mediaSynchronizer?.mediaSession.coordinator.canSendPositionUpdates,
222
274
  ]);
223
275
  return {
224
276
  suspended: !!suspension,
@@ -0,0 +1 @@
1
+ {"version":3,"file":"useMediaSynchronizer.js","sourceRoot":"","sources":["../../../src/live-hooks/useMediaSynchronizer.ts"],"names":[],"mappings":"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"}
@@ -2,12 +2,12 @@
2
2
  * Copyright (c) Microsoft Corporation. All rights reserved.
3
3
  * Licensed under the Microsoft Live Share SDK License.
4
4
  */
5
- import { IFluidContainer, LoadableObjectClassRecord } from "fluid-framework";
5
+ import { ContainerSchema, IFluidContainer } from "fluid-framework";
6
6
  import React from "react";
7
7
  import { AzureClientProps, AzureContainerServices } from "@fluidframework/azure-client";
8
- import { IAzureContainerResults } from "../types";
9
- import { ISharedStateRegistryResponse } from "../shared-hooks";
10
- import { IFluidTurboClient } from "@microsoft/live-share-turbo";
8
+ import { IAzureContainerResults } from "../types/index.js";
9
+ import { ISharedStateRegistryResponse } from "../shared-hooks/index.js";
10
+ import { BaseLiveShareClient } from "@microsoft/live-share/internal";
11
11
  /**
12
12
  * React Context provider values for `<AzureProvider>` and `<LiveShareProvider>`.
13
13
  *
@@ -18,7 +18,7 @@ export interface IFluidContext extends ISharedStateRegistryResponse {
18
18
  /**
19
19
  * The Fluid Turbo client used for connecting to the Fluid container.
20
20
  */
21
- clientRef: React.MutableRefObject<IFluidTurboClient>;
21
+ clientRef: React.MutableRefObject<BaseLiveShareClient>;
22
22
  /**
23
23
  * Stateful Fluid container.
24
24
  */
@@ -41,7 +41,7 @@ export interface IFluidContext extends ISharedStateRegistryResponse {
41
41
  * @param initialObjects Optional. initial object schema, which should match that passed to `createContainer()`.
42
42
  * @returns promise that returns a results object once complete (e.g., container, services, etc.)
43
43
  */
44
- getContainer: (containerId: string, initialObjects?: LoadableObjectClassRecord) => Promise<IAzureContainerResults>;
44
+ getContainer: (containerId: string, fluidContainerSchema?: ContainerSchema) => Promise<IAzureContainerResults>;
45
45
  /**
46
46
  * React callback function to create and connect to a new Fluid container.
47
47
  *
@@ -52,7 +52,7 @@ export interface IFluidContext extends ISharedStateRegistryResponse {
52
52
  * @param onInitializeContainer Optional. A callback for when the container is first initialized, which is useful for setting default values to objects in `initialObjects`.
53
53
  * @returns promise that returns a results object once complete (e.g., container, services, etc.)
54
54
  */
55
- createContainer: (initialObjects?: LoadableObjectClassRecord, onInitializeContainer?: (container: IFluidContainer) => void) => Promise<IAzureContainerResults>;
55
+ createContainer: (fluidContainerSchema?: ContainerSchema, onInitializeContainer?: (container: IFluidContainer) => void) => Promise<IAzureContainerResults>;
56
56
  }
57
57
  /**
58
58
  * @hidden
@@ -95,9 +95,9 @@ export interface IAzureProviderProps {
95
95
  */
96
96
  createOnLoad?: boolean;
97
97
  /**
98
- * The initial object schema to use when {@link joinOnLoad} or {@link createOnLoad} is true.
98
+ * The initial schema to use when {@link joinOnLoad} or {@link createOnLoad} is true.
99
99
  */
100
- initialObjects?: LoadableObjectClassRecord;
100
+ fluidContainerSchema?: ContainerSchema;
101
101
  /**
102
102
  * Flag to control whether or not to connect to an existing container on first mount.
103
103
  *
@@ -0,0 +1 @@
1
+ {"version":3,"file":"AzureProvider.d.ts","sourceRoot":"","sources":["../../../src/providers/AzureProvider.tsx"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EACH,gBAAgB,EAChB,sBAAsB,EACzB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EACH,4BAA4B,EAE/B,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAErE;;;;;GAKG;AACH,MAAM,WAAW,aAAc,SAAQ,4BAA4B;IAC/D;;OAEG;IACH,SAAS,EAAE,KAAK,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,CAAC;IACvD;;OAEG;IACH,SAAS,EAAE,eAAe,GAAG,SAAS,CAAC;IACvC;;OAEG;IACH,QAAQ,EAAE,sBAAsB,GAAG,SAAS,CAAC;IAC7C;;OAEG;IACH,SAAS,EAAE,KAAK,GAAG,SAAS,CAAC;IAC7B;;;;;;;;;OASG;IACH,YAAY,EAAE,CACV,WAAW,EAAE,MAAM,EACnB,oBAAoB,CAAC,EAAE,eAAe,KACrC,OAAO,CAAC,sBAAsB,CAAC,CAAC;IACrC;;;;;;;;;OASG;IACH,eAAe,EAAE,CACb,oBAAoB,CAAC,EAAE,eAAe,EACtC,qBAAqB,CAAC,EAAE,CAAC,SAAS,EAAE,eAAe,KAAK,IAAI,KAC3D,OAAO,CAAC,sBAAsB,CAAC,CAAC;CACxC;AAED;;GAEG;AACH,eAAO,MAAM,YAAY,8BAExB,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,sBAAsB,QAAO,aAQzC,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAChC;;OAEG;IACH,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B;;OAEG;IACH,aAAa,EAAE,gBAAgB,CAAC;IAChC;;;;;OAKG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB;;OAEG;IACH,oBAAoB,CAAC,EAAE,eAAe,CAAC;IACvC;;;;;OAKG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACxB;AAED;;GAEG;AACH,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,mBAAmB,CAoHvD,CAAC"}
@@ -1,16 +1,7 @@
1
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
2
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
3
- return new (P || (P = Promise))(function (resolve, reject) {
4
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
5
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
6
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
7
- step((generator = generator.apply(thisArg, _arguments || [])).next());
8
- });
9
- };
10
1
  import { jsx as _jsx } from "react/jsx-runtime";
11
2
  import React from "react";
12
- import { useSharedStateRegistry, } from "../shared-hooks";
13
- import { AzureTurboClient, } from "@microsoft/live-share-turbo";
3
+ import { useSharedStateRegistry, } from "../shared-hooks/index.js";
4
+ import { AzureLiveShareClient } from "@microsoft/live-share";
14
5
  /**
15
6
  * @hidden
16
7
  */
@@ -34,19 +25,18 @@ export const useFluidObjectsContext = () => {
34
25
  * React Context provider component for using Fluid data objects & joining/creating a Fluid document `AzureClient`.
35
26
  */
36
27
  export const AzureProvider = (props) => {
37
- var _a;
38
28
  const startedRef = React.useRef(false);
39
- const clientRef = React.useRef(new AzureTurboClient(props.clientOptions));
29
+ const clientRef = React.useRef(new AzureLiveShareClient(props.clientOptions));
40
30
  const [results, setResults] = React.useState();
41
31
  const [joinError, setJoinError] = React.useState();
42
32
  const stateRegistryCallbacks = useSharedStateRegistry(results);
43
33
  /**
44
34
  * Get the container for a given containerId using AzureClient
45
35
  */
46
- const getContainer = React.useCallback((containerId, initialObjects) => __awaiter(void 0, void 0, void 0, function* () {
47
- return new Promise((resolve, reject) => __awaiter(void 0, void 0, void 0, function* () {
36
+ const getContainer = React.useCallback(async (containerId, fluidContainerSchema) => {
37
+ return new Promise(async (resolve, reject) => {
48
38
  try {
49
- const results = yield clientRef.current.getContainer(containerId, initialObjects);
39
+ const results = await clientRef.current.getContainer(containerId, fluidContainerSchema);
50
40
  setResults(results);
51
41
  resolve(results);
52
42
  }
@@ -56,19 +46,19 @@ export const AzureProvider = (props) => {
56
46
  }
57
47
  reject(error);
58
48
  }
59
- }));
60
- }), [props.containerId, setResults]);
49
+ });
50
+ }, [props.containerId, setResults]);
61
51
  /**
62
52
  * Create container callback to create a new container using AzureClient
63
53
  */
64
- const createContainer = React.useCallback((initialObjects, onInitializeContainer) => __awaiter(void 0, void 0, void 0, function* () {
65
- return new Promise((resolve, reject) => __awaiter(void 0, void 0, void 0, function* () {
54
+ const createContainer = React.useCallback(async (fluidContainerSchema, onInitializeContainer) => {
55
+ return new Promise(async (resolve, reject) => {
66
56
  try {
67
- const results = yield clientRef.current.createContainer(initialObjects);
57
+ const results = await clientRef.current.createContainer(fluidContainerSchema);
68
58
  if (onInitializeContainer) {
69
59
  onInitializeContainer(results.container);
70
60
  }
71
- const containerId = yield results.container.attach();
61
+ const containerId = await results.container.attach();
72
62
  window.location.hash = containerId;
73
63
  setResults(results);
74
64
  resolve(results);
@@ -79,41 +69,46 @@ export const AzureProvider = (props) => {
79
69
  }
80
70
  reject(error);
81
71
  }
82
- }));
83
- }), [props.containerId, setResults]);
72
+ });
73
+ }, [props.containerId, setResults]);
84
74
  /**
85
75
  * Joins a container if `props.joinOnLoad` is true and `props.containerId` is known. Creates a new container if `props.createOnLoad` is true
86
76
  * and `props.containerId` is not known.
87
77
  */
88
78
  React.useEffect(() => {
89
- var _a;
90
79
  // This hook should only be called once, so we use a ref to track if it has been called.
91
80
  // This is a workaround for the fact that useEffect is called twice on initial render in React V18.
92
81
  // We are not doing this here for backwards compatibility. View the README for more information.
93
- if (((_a = results === null || results === void 0 ? void 0 : results.container) === null || _a === void 0 ? void 0 : _a.connectionState) !== undefined ||
82
+ if (results?.container?.connectionState !== undefined ||
94
83
  startedRef.current)
95
84
  return;
96
85
  startedRef.current = true;
97
86
  if (props.containerId && props.joinOnLoad) {
98
- getContainer(props.containerId, props.initialObjects);
87
+ getContainer(props.containerId, props.fluidContainerSchema);
99
88
  }
100
89
  else if (!props.containerId && props.createOnLoad) {
101
- createContainer(props.initialObjects);
90
+ createContainer(props.fluidContainerSchema);
102
91
  }
103
92
  }, [
104
- (_a = results === null || results === void 0 ? void 0 : results.container) === null || _a === void 0 ? void 0 : _a.connectionState,
93
+ results?.container?.connectionState,
105
94
  props.containerId,
106
95
  props.createOnLoad,
107
96
  props.joinOnLoad,
108
- props.initialObjects,
97
+ props.fluidContainerSchema,
109
98
  getContainer,
110
99
  createContainer,
111
100
  ]);
112
- return (_jsx(FluidContext.Provider, { value: Object.assign({ clientRef, container: results === null || results === void 0 ? void 0 : results.container, services: results === null || results === void 0 ? void 0 : results.services, joinError,
101
+ return (_jsx(FluidContext.Provider, { value: {
102
+ clientRef,
103
+ container: results?.container,
104
+ services: results?.services,
105
+ joinError,
113
106
  createContainer,
114
- getContainer }, stateRegistryCallbacks), children: props.children }));
107
+ getContainer,
108
+ ...stateRegistryCallbacks,
109
+ }, children: props.children }));
115
110
  };
116
111
  function isFluidObjectsContext(value) {
117
- return !!(value === null || value === void 0 ? void 0 : value.clientRef);
112
+ return !!value?.clientRef;
118
113
  }
119
114
  //# sourceMappingURL=AzureProvider.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"AzureProvider.js","sourceRoot":"","sources":["../../../src/providers/AzureProvider.tsx"],"names":[],"mappings":"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"}
@@ -2,7 +2,7 @@
2
2
  * Copyright (c) Microsoft Corporation. All rights reserved.
3
3
  * Licensed under the Microsoft Live Share SDK License.
4
4
  */
5
- import { IFluidContainer, LoadableObjectClassRecord } from "fluid-framework";
5
+ import { ContainerSchema, IFluidContainer } from "fluid-framework";
6
6
  import React from "react";
7
7
  import { ILiveShareClientOptions, ILiveShareHost, ILiveShareJoinResults, ITimestampProvider } from "@microsoft/live-share";
8
8
  /**
@@ -40,7 +40,7 @@ export interface ILiveShareContext {
40
40
  * @param onInitializeContainer Optional. Callback for when the container is first created.
41
41
  * @returns Promise with `ILiveShareJoinResults`, which includes the Fluid container
42
42
  */
43
- join: (initialObjects?: LoadableObjectClassRecord, onInitializeContainer?: (container: IFluidContainer) => void) => Promise<ILiveShareJoinResults>;
43
+ join: (fluidContainerSchema?: ContainerSchema, onInitializeContainer?: (container: IFluidContainer) => void) => Promise<ILiveShareJoinResults>;
44
44
  }
45
45
  /**
46
46
  * @hidden
@@ -54,6 +54,57 @@ export declare const LiveShareContext: React.Context<ILiveShareContext>;
54
54
  * See `useFluidObjectsContext` for other information related to the Live Share session, such as the `container`.
55
55
  *
56
56
  * @returns current state of `LiveShareContext`
57
+ *
58
+ * @example
59
+ ```jsx
60
+ // LiveShareApp.jsx
61
+ import { LiveShareProvider } from "@microsoft/live-share-react";
62
+ import { LiveShareHost } from "@microsoft/teams-js";
63
+
64
+ const host = LiveShareHost.create();
65
+
66
+ export function LiveShareApp() {
67
+ // Call app.initialize() from teams-js before rendering LiveShareProvider
68
+
69
+ return (
70
+ <LiveShareProvider
71
+ joinOnLoad={true}
72
+ host={host}
73
+ >
74
+ <LiveShareLoader>
75
+ <LiveCheckbox />
76
+ </LiveShareLoader>
77
+ </LiveShareProvider>
78
+ );
79
+ }
80
+
81
+ // LiveShareLoader.jsx
82
+ import { useLiveShareContext } from "@microsoft/live-share-react";
83
+
84
+ export function LiveShareLoader({ children }) {
85
+ const { joined, joinError } = useLiveShareContext();
86
+
87
+ if (joinError) return <>{joinError.message}</>;
88
+ if (!joined) return <>Joining Live Share session...</>;
89
+ return <>{children}</>
90
+ }
91
+
92
+ // LiveCheckbox.jsx
93
+ import { useLiveState } from "@microsoft/live-share-react";
94
+
95
+ export function LiveCheckbox() {
96
+ const [checked, setChecked] = useLiveState("MY-UNIQUE-ID", false);
97
+ return (
98
+ <input
99
+ type="checkbox"
100
+ checked={checked}
101
+ onChange={() => {
102
+ setChecked(!checked);
103
+ }}
104
+ />
105
+ );
106
+ }
107
+ ```
57
108
  */
58
109
  export declare const useLiveShareContext: () => ILiveShareContext;
59
110
  /**
@@ -76,9 +127,9 @@ export interface ILiveShareProviderProps {
76
127
  */
77
128
  host: ILiveShareHost;
78
129
  /**
79
- * The initial object schema to use when {@link joinOnLoad} is true.
130
+ * The schema to use when {@link joinOnLoad} is true.
80
131
  */
81
- initialObjects?: LoadableObjectClassRecord;
132
+ fluidContainerSchema?: ContainerSchema;
82
133
  /**
83
134
  * Optional. Flag to determine whether to join Fluid container on load.
84
135
  */
@@ -86,6 +137,57 @@ export interface ILiveShareProviderProps {
86
137
  }
87
138
  /**
88
139
  * React Context provider component for using Live Share data objects & joining a Live Share session using `LiveShareClient`.
140
+ *
141
+ * @example
142
+ ```jsx
143
+ // LiveShareApp.jsx
144
+ import { LiveShareProvider } from "@microsoft/live-share-react";
145
+ import { LiveShareHost } from "@microsoft/teams-js";
146
+
147
+ const host = LiveShareHost.create();
148
+
149
+ export function LiveShareApp() {
150
+ // Call app.initialize() from teams-js before rendering LiveShareProvider
151
+
152
+ return (
153
+ <LiveShareProvider
154
+ joinOnLoad={true}
155
+ host={host}
156
+ >
157
+ <LiveShareLoader>
158
+ <LiveCheckbox />
159
+ </LiveShareLoader>
160
+ </LiveShareProvider>
161
+ );
162
+ }
163
+
164
+ // LiveShareLoader.jsx
165
+ import { useLiveShareContext } from "@microsoft/live-share-react";
166
+
167
+ export function LiveShareLoader({ children }) {
168
+ const { joined, joinError } = useLiveShareContext();
169
+
170
+ if (joinError) return <>{joinError.message}</>;
171
+ if (!joined) return <>Joining Live Share session...</>;
172
+ return <>{children}</>
173
+ }
174
+
175
+ // LiveCheckbox.jsx
176
+ import { useLiveState } from "@microsoft/live-share-react";
177
+
178
+ export function LiveCheckbox() {
179
+ const [checked, setChecked] = useLiveState("MY-UNIQUE-ID", false);
180
+ return (
181
+ <input
182
+ type="checkbox"
183
+ checked={checked}
184
+ onChange={() => {
185
+ setChecked(!checked);
186
+ }}
187
+ />
188
+ );
189
+ }
190
+ ```
89
191
  */
90
192
  export declare const LiveShareProvider: React.FC<ILiveShareProviderProps>;
91
193
  //# sourceMappingURL=LiveShareProvider.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"LiveShareProvider.d.ts","sourceRoot":"","sources":["../../../src/providers/LiveShareProvider.tsx"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EACH,uBAAuB,EACvB,cAAc,EACd,qBAAqB,EACrB,kBAAkB,EAErB,MAAM,uBAAuB,CAAC;AAI/B;;;;;;GAMG;AACH,MAAM,WAAW,iBAAiB;IAC9B;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,MAAM,EAAE,OAAO,CAAC;IAChB;;OAEG;IACH,SAAS,EAAE,KAAK,GAAG,SAAS,CAAC;IAC7B;;;OAGG;IACH,iBAAiB,EAAE,kBAAkB,GAAG,SAAS,CAAC;IAClD;;;;;;;;;OASG;IACH,IAAI,EAAE,CACF,oBAAoB,CAAC,EAAE,eAAe,EACtC,qBAAqB,CAAC,EAAE,CAAC,SAAS,EAAE,eAAe,KAAK,IAAI,KAC3D,OAAO,CAAC,qBAAqB,CAAC,CAAC;CACvC;AAED;;GAEG;AACH,eAAO,MAAM,gBAAgB,kCAE5B,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2DG;AACH,eAAO,MAAM,mBAAmB,QAAO,iBAQtC,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACpC;;OAEG;IACH,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B;;OAEG;IACH,aAAa,CAAC,EAAE,uBAAuB,CAAC;IACxC;;;;;OAKG;IACH,IAAI,EAAE,cAAc,CAAC;IACrB;;OAEG;IACH,oBAAoB,CAAC,EAAE,eAAe,CAAC;IACvC;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACxB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqDG;AACH,eAAO,MAAM,iBAAiB,EAAE,KAAK,CAAC,EAAE,CAAC,uBAAuB,CAkG/D,CAAC"}