@microsoft/teamsfx-react 3.0.3-beta.2023101202.0 → 3.1.0-alpha

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/build/cjs/useTeams.d.ts +1 -0
  2. package/build/cjs/useTeams.d.ts.map +1 -1
  3. package/build/cjs/useTeams.js +18 -9
  4. package/build/cjs/useTeamsUserCredential.d.ts.map +1 -1
  5. package/build/cjs/useTeamsUserCredential.js +11 -13
  6. package/build/esm/useTeams.d.ts +1 -0
  7. package/build/esm/useTeams.d.ts.map +1 -1
  8. package/build/esm/useTeams.js +16 -7
  9. package/build/esm/useTeamsUserCredential.d.ts.map +1 -1
  10. package/build/esm/useTeamsUserCredential.js +12 -14
  11. package/package.json +3 -3
package/build/cjs/useTeams.d.ts CHANGED
@@ -23,6 +23,7 @@ export declare function useTeams(options?: {
23
23
  theme: Theme;
24
24
  themeString: string;
25
25
  context?: app.Context;
26
+ loading?: boolean;
26
27
  },
27
28
  {
28
29
  setTheme: (theme: string | undefined) => void;
package/build/cjs/useTeams.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"useTeams.d.ts","sourceRoot":"","sources":["../../src/useTeams.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,GAAG,EAAS,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAIL,KAAK,EACN,MAAM,4BAA4B,CAAC;AAQpC;;;;;;;;;;;;GAYG;AACH,wBAAgB,QAAQ,CAAC,OAAO,CAAC,EAAE;IACjC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;CAC5C,GAAG;IACF;QACE,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,KAAK,EAAE,KAAK,CAAC;QACb,WAAW,EAAE,MAAM,CAAC;QACpB,OAAO,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC;KACvB;IACD;QACE,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI,CAAC;KAC/C;CACF,CA4DA"}
1
+ {"version":3,"file":"useTeams.d.ts","sourceRoot":"","sources":["../../src/useTeams.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,GAAG,EAAS,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAIL,KAAK,EACN,MAAM,4BAA4B,CAAC;AAMpC;;;;;;;;;;;;GAYG;AACH,wBAAgB,QAAQ,CAAC,OAAO,CAAC,EAAE;IACjC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;CAC5C,GAAG;IACF;QACE,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,KAAK,EAAE,KAAK,CAAC;QACb,WAAW,EAAE,MAAM,CAAC;QACpB,OAAO,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC;QACtB,OAAO,CAAC,EAAE,OAAO,CAAC;KACnB;IACD;QACE,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI,CAAC;KAC/C;CACF,CAkEA"}
package/build/cjs/useTeams.js CHANGED
@@ -1,8 +1,8 @@
1
1
  "use strict";
2
- // Copyright (c) Microsoft Corporation.
3
- // Licensed under the MIT license.
4
2
  Object.defineProperty(exports, "__esModule", { value: true });
5
3
  exports.useTeams = void 0;
4
+ // Copyright (c) Microsoft Corporation.
5
+ // Licensed under the MIT license.
6
6
  var react_1 = require("react");
7
7
  var react_dom_1 = require("react-dom");
8
8
  var teams_js_1 = require("@microsoft/teams-js");
@@ -26,12 +26,13 @@ var getTheme = function () {
26
26
  * - setTheme - manually set the theme
27
27
  */
28
28
  function useTeams(options) {
29
- var _a = (0, react_1.useState)(undefined), inTeams = _a[0], setInTeams = _a[1];
30
- var _b = (0, react_1.useState)(undefined), fullScreen = _b[0], setFullScreen = _b[1];
31
- var _c = (0, react_1.useState)(react_components_1.teamsLightTheme), theme = _c[0], setTheme = _c[1];
32
- var _d = (0, react_1.useState)("default"), themeString = _d[0], setThemeString = _d[1];
29
+ var _a = (0, react_1.useState)(undefined), loading = _a[0], setLoading = _a[1];
30
+ var _b = (0, react_1.useState)(undefined), inTeams = _b[0], setInTeams = _b[1];
31
+ var _c = (0, react_1.useState)(undefined), fullScreen = _c[0], setFullScreen = _c[1];
32
+ var _d = (0, react_1.useState)(react_components_1.teamsLightTheme), theme = _d[0], setTheme = _d[1];
33
+ var _e = (0, react_1.useState)("default"), themeString = _e[0], setThemeString = _e[1];
33
34
  var initialTheme = (0, react_1.useState)(options && options.initialTheme ? options.initialTheme : getTheme())[0];
34
- var _e = (0, react_1.useState)(undefined), context = _e[0], setContext = _e[1];
35
+ var _f = (0, react_1.useState)(undefined), context = _f[0], setContext = _f[1];
35
36
  var themeChangeHandler = function (theme) {
36
37
  setThemeString(theme || "default");
37
38
  switch (theme) {
@@ -51,7 +52,9 @@ function useTeams(options) {
51
52
  : themeChangeHandler;
52
53
  (0, react_1.useEffect)(function () {
53
54
  // set initial theme based on options or query string
54
- overrideThemeHandler(initialTheme);
55
+ if (initialTheme) {
56
+ overrideThemeHandler(initialTheme);
57
+ }
55
58
  teams_js_1.app
56
59
  .initialize()
57
60
  .then(function () {
@@ -68,15 +71,21 @@ function useTeams(options) {
68
71
  teams_js_1.pages.registerFullScreenHandler(function (isFullScreen) {
69
72
  setFullScreen(isFullScreen);
70
73
  });
74
+ setLoading(false);
71
75
  })
72
76
  .catch(function () {
77
+ setLoading(false);
73
78
  setInTeams(false);
74
79
  });
75
80
  })
76
81
  .catch(function () {
82
+ setLoading(false);
77
83
  setInTeams(false);
78
84
  });
79
85
  }, []);
80
- return [{ inTeams: inTeams, fullScreen: fullScreen, theme: theme, context: context, themeString: themeString }, { setTheme: overrideThemeHandler }];
86
+ return [
87
+ { inTeams: inTeams, fullScreen: fullScreen, theme: theme, context: context, themeString: themeString, loading: loading },
88
+ { setTheme: overrideThemeHandler },
89
+ ];
81
90
  }
82
91
  exports.useTeams = useTeams;
package/build/cjs/useTeamsUserCredential.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"useTeamsUserCredential.d.ts","sourceRoot":"","sources":["../../src/useTeamsUserCredential.ts"],"names":[],"mappings":"AAGA,OAAO,EAIL,6BAA6B,EAC7B,mBAAmB,EACpB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAC;AAGnD,MAAM,MAAM,0BAA0B,GAAG;IACvC;;OAEG;IACH,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAC1C;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,KAAK,EAAE,OAAO,CAAC;IACf;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;OAEG;IACH,KAAK,EAAE,KAAK,CAAC;IACb;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB;;OAEG;IAEH,OAAO,CAAC,EAAE,GAAG,CAAC;CACf,CAAC;AAEF;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CACpC,UAAU,EAAE,6BAA6B,GACxC,0BAA0B,CAY5B"}
1
+ {"version":3,"file":"useTeamsUserCredential.d.ts","sourceRoot":"","sources":["../../src/useTeamsUserCredential.ts"],"names":[],"mappings":"AAGA,OAAO,EAIL,6BAA6B,EAC7B,mBAAmB,EACpB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAC;AAGnD,MAAM,MAAM,0BAA0B,GAAG;IACvC;;OAEG;IACH,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAC1C;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,KAAK,EAAE,OAAO,CAAC;IACf;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;OAEG;IACH,KAAK,EAAE,KAAK,CAAC;IACb;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB;;OAEG;IAEH,OAAO,CAAC,EAAE,GAAG,CAAC;CACf,CAAC;AAEF;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CACpC,UAAU,EAAE,6BAA6B,GACxC,0BAA0B,CAiB5B"}
package/build/cjs/useTeamsUserCredential.js CHANGED
@@ -16,19 +16,17 @@ var useData_1 = require("./useData");
16
16
  * @public
17
17
  */
18
18
  function useTeamsUserCredential(authConfig) {
19
- var _this = this;
19
+ var _a;
20
20
  var result = (0, useTeams_1.useTeams)({})[0];
21
- var _a = (0, useData_1.useData)(function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
22
- return tslib_1.__generator(this, function (_a) {
23
- if (process.env.NODE_ENV === "development") {
24
- (0, teamsfx_1.setLogLevel)(teamsfx_1.LogLevel.Verbose);
25
- (0, teamsfx_1.setLogFunction)(function (level, message) {
26
- console.log(message);
27
- });
28
- }
29
- return [2 /*return*/, new teamsfx_1.TeamsUserCredential(authConfig)];
30
- });
31
- }); }), data = _a.data, error = _a.error, loading = _a.loading;
32
- return tslib_1.__assign({ teamsUserCredential: data, error: error, loading: loading }, result);
21
+ var _b = (0, useData_1.useData)(function () {
22
+ if (process.env.NODE_ENV === "development") {
23
+ (0, teamsfx_1.setLogLevel)(teamsfx_1.LogLevel.Verbose);
24
+ (0, teamsfx_1.setLogFunction)(function (level, message) {
25
+ console.log(message);
26
+ });
27
+ }
28
+ return Promise.resolve(new teamsfx_1.TeamsUserCredential(authConfig));
29
+ }), data = _b.data, error = _b.error, loading = _b.loading;
30
+ return tslib_1.__assign(tslib_1.__assign({}, result), { teamsUserCredential: data, error: error, loading: loading || ((_a = result.loading) !== null && _a !== void 0 ? _a : true) });
33
31
  }
34
32
  exports.useTeamsUserCredential = useTeamsUserCredential;
package/build/esm/useTeams.d.ts CHANGED
@@ -23,6 +23,7 @@ export declare function useTeams(options?: {
23
23
  theme: Theme;
24
24
  themeString: string;
25
25
  context?: app.Context;
26
+ loading?: boolean;
26
27
  },
27
28
  {
28
29
  setTheme: (theme: string | undefined) => void;
package/build/esm/useTeams.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"useTeams.d.ts","sourceRoot":"","sources":["../../src/useTeams.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,GAAG,EAAS,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAIL,KAAK,EACN,MAAM,4BAA4B,CAAC;AAQpC;;;;;;;;;;;;GAYG;AACH,wBAAgB,QAAQ,CAAC,OAAO,CAAC,EAAE;IACjC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;CAC5C,GAAG;IACF;QACE,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,KAAK,EAAE,KAAK,CAAC;QACb,WAAW,EAAE,MAAM,CAAC;QACpB,OAAO,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC;KACvB;IACD;QACE,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI,CAAC;KAC/C;CACF,CA4DA"}
1
+ {"version":3,"file":"useTeams.d.ts","sourceRoot":"","sources":["../../src/useTeams.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,GAAG,EAAS,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAIL,KAAK,EACN,MAAM,4BAA4B,CAAC;AAMpC;;;;;;;;;;;;GAYG;AACH,wBAAgB,QAAQ,CAAC,OAAO,CAAC,EAAE;IACjC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;CAC5C,GAAG;IACF;QACE,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,KAAK,EAAE,KAAK,CAAC;QACb,WAAW,EAAE,MAAM,CAAC;QACpB,OAAO,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC;QACtB,OAAO,CAAC,EAAE,OAAO,CAAC;KACnB;IACD;QACE,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI,CAAC;KAC/C;CACF,CAkEA"}
package/build/esm/useTeams.js CHANGED
@@ -23,12 +23,13 @@ var getTheme = function () {
23
23
  * - setTheme - manually set the theme
24
24
  */
25
25
  export function useTeams(options) {
26
- var _a = useState(undefined), inTeams = _a[0], setInTeams = _a[1];
27
- var _b = useState(undefined), fullScreen = _b[0], setFullScreen = _b[1];
28
- var _c = useState(teamsLightTheme), theme = _c[0], setTheme = _c[1];
29
- var _d = useState("default"), themeString = _d[0], setThemeString = _d[1];
26
+ var _a = useState(undefined), loading = _a[0], setLoading = _a[1];
27
+ var _b = useState(undefined), inTeams = _b[0], setInTeams = _b[1];
28
+ var _c = useState(undefined), fullScreen = _c[0], setFullScreen = _c[1];
29
+ var _d = useState(teamsLightTheme), theme = _d[0], setTheme = _d[1];
30
+ var _e = useState("default"), themeString = _e[0], setThemeString = _e[1];
30
31
  var initialTheme = useState(options && options.initialTheme ? options.initialTheme : getTheme())[0];
31
- var _e = useState(undefined), context = _e[0], setContext = _e[1];
32
+ var _f = useState(undefined), context = _f[0], setContext = _f[1];
32
33
  var themeChangeHandler = function (theme) {
33
34
  setThemeString(theme || "default");
34
35
  switch (theme) {
@@ -48,7 +49,9 @@ export function useTeams(options) {
48
49
  : themeChangeHandler;
49
50
  useEffect(function () {
50
51
  // set initial theme based on options or query string
51
- overrideThemeHandler(initialTheme);
52
+ if (initialTheme) {
53
+ overrideThemeHandler(initialTheme);
54
+ }
52
55
  app
53
56
  .initialize()
54
57
  .then(function () {
@@ -65,14 +68,20 @@ export function useTeams(options) {
65
68
  pages.registerFullScreenHandler(function (isFullScreen) {
66
69
  setFullScreen(isFullScreen);
67
70
  });
71
+ setLoading(false);
68
72
  })
69
73
  .catch(function () {
74
+ setLoading(false);
70
75
  setInTeams(false);
71
76
  });
72
77
  })
73
78
  .catch(function () {
79
+ setLoading(false);
74
80
  setInTeams(false);
75
81
  });
76
82
  }, []);
77
- return [{ inTeams: inTeams, fullScreen: fullScreen, theme: theme, context: context, themeString: themeString }, { setTheme: overrideThemeHandler }];
83
+ return [
84
+ { inTeams: inTeams, fullScreen: fullScreen, theme: theme, context: context, themeString: themeString, loading: loading },
85
+ { setTheme: overrideThemeHandler },
86
+ ];
78
87
  }
package/build/esm/useTeamsUserCredential.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"useTeamsUserCredential.d.ts","sourceRoot":"","sources":["../../src/useTeamsUserCredential.ts"],"names":[],"mappings":"AAGA,OAAO,EAIL,6BAA6B,EAC7B,mBAAmB,EACpB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAC;AAGnD,MAAM,MAAM,0BAA0B,GAAG;IACvC;;OAEG;IACH,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAC1C;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,KAAK,EAAE,OAAO,CAAC;IACf;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;OAEG;IACH,KAAK,EAAE,KAAK,CAAC;IACb;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB;;OAEG;IAEH,OAAO,CAAC,EAAE,GAAG,CAAC;CACf,CAAC;AAEF;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CACpC,UAAU,EAAE,6BAA6B,GACxC,0BAA0B,CAY5B"}
1
+ {"version":3,"file":"useTeamsUserCredential.d.ts","sourceRoot":"","sources":["../../src/useTeamsUserCredential.ts"],"names":[],"mappings":"AAGA,OAAO,EAIL,6BAA6B,EAC7B,mBAAmB,EACpB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAC;AAGnD,MAAM,MAAM,0BAA0B,GAAG;IACvC;;OAEG;IACH,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAC1C;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,KAAK,EAAE,OAAO,CAAC;IACf;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;OAEG;IACH,KAAK,EAAE,KAAK,CAAC;IACb;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB;;OAEG;IAEH,OAAO,CAAC,EAAE,GAAG,CAAC;CACf,CAAC;AAEF;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CACpC,UAAU,EAAE,6BAA6B,GACxC,0BAA0B,CAiB5B"}
package/build/esm/useTeamsUserCredential.js CHANGED
@@ -1,6 +1,6 @@
1
1
  // Copyright (c) Microsoft Corporation.
2
2
  // Licensed under the MIT license.
3
- import { __assign, __awaiter, __generator } from "tslib";
3
+ import { __assign } from "tslib";
4
4
  import { LogLevel, setLogLevel, setLogFunction, TeamsUserCredential, } from "@microsoft/teamsfx";
5
5
  import { useTeams } from "./useTeams";
6
6
  import { useData } from "./useData";
@@ -13,18 +13,16 @@ import { useData } from "./useData";
13
13
  * @public
14
14
  */
15
15
  export function useTeamsUserCredential(authConfig) {
16
- var _this = this;
16
+ var _a;
17
17
  var result = useTeams({})[0];
18
- var _a = useData(function () { return __awaiter(_this, void 0, void 0, function () {
19
- return __generator(this, function (_a) {
20
- if (process.env.NODE_ENV === "development") {
21
- setLogLevel(LogLevel.Verbose);
22
- setLogFunction(function (level, message) {
23
- console.log(message);
24
- });
25
- }
26
- return [2 /*return*/, new TeamsUserCredential(authConfig)];
27
- });
28
- }); }), data = _a.data, error = _a.error, loading = _a.loading;
29
- return __assign({ teamsUserCredential: data, error: error, loading: loading }, result);
18
+ var _b = useData(function () {
19
+ if (process.env.NODE_ENV === "development") {
20
+ setLogLevel(LogLevel.Verbose);
21
+ setLogFunction(function (level, message) {
22
+ console.log(message);
23
+ });
24
+ }
25
+ return Promise.resolve(new TeamsUserCredential(authConfig));
26
+ }), data = _b.data, error = _b.error, loading = _b.loading;
27
+ return __assign(__assign({}, result), { teamsUserCredential: data, error: error, loading: loading || ((_a = result.loading) !== null && _a !== void 0 ? _a : true) });
30
28
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@microsoft/teamsfx-react",
3
- "version": "3.0.3-beta.2023101202.0",
3
+ "version": "3.1.0-alpha",
4
4
  "description": "React helper functions for Microsoft TeamsFx",
5
5
  "main": "build/cjs/index.js",
6
6
  "module": "build/esm/index.js",
@@ -74,7 +74,7 @@
74
74
  },
75
75
  "dependencies": {
76
76
  "@fluentui/react": "^8.106.1",
77
- "@microsoft/teamsfx": "2.3.1-beta.2023101202.0"
77
+ "@microsoft/teamsfx": "2.3.0"
78
78
  },
79
79
  "publishConfig": {
80
80
  "access": "public"
@@ -84,5 +84,5 @@
84
84
  "npx eslint --cache --fix --quiet"
85
85
  ]
86
86
  },
87
- "gitHead": "9982afad8d3275288048fac048dc9f5456f41e08"
87
+ "gitHead": "4f57ac09c1ed58b994dd46e23b03c4aeec22ae56"
88
88
  }