Merge branch 'master' into conat-supercluster

Author: williamstein

src/packages/frontend/account/account-page.tsx

@@ -235,7 +235,7 @@ export const AccountPage: React.FC = () => {
     );
   }
 
-  function render_logged_in_view(): JSX.Element {
+  function render_logged_in_view(): React.JSX.Element {
     if (!account_id) {
       return (
         <div style={{ textAlign: "center", paddingTop: "15px" }}>

src/packages/frontend/account/account-preferences.tsx

@@ -43,7 +43,7 @@ export const AccountPreferences: React.FC = () => {
   const kucalc = useTypedRedux("customize", "kucalc");
   const ssh_gateway = useTypedRedux("customize", "ssh_gateway");
 
-  function render_account_settings(): JSX.Element {
+  function render_account_settings(): React.JSX.Element {
     return (
       <AccountSettings
         account_id={account_id}
@@ -65,7 +65,7 @@ export const AccountPreferences: React.FC = () => {
     );
   }
 
-  function render_other_settings(): JSX.Element {
+  function render_other_settings(): React.JSX.Element {
     if (other_settings == null) return <Loading />;
     return (
       <OtherSettings
@@ -78,7 +78,7 @@ export const AccountPreferences: React.FC = () => {
     );
   }
 
-  function renderDarkMode(): JSX.Element {
+  function renderDarkMode(): React.JSX.Element {
     return (
       <Tooltip title="Enable dark mode across the entire user interface. See further dark mode configuration below.">
         <Form style={{ height: "37px" }}>
@@ -120,7 +120,7 @@ export const AccountPreferences: React.FC = () => {
     );
   }
 
-  function render_all_settings(): JSX.Element {
+  function render_all_settings(): React.JSX.Element {
     return (
       <>
         <Flex>

src/packages/frontend/account/avatar/users-viewing.tsx

@@ -126,7 +126,7 @@ export function UsersViewing(props: Readonly<Props>) {
     }
     v.sort((a, b) => cmp(b.activity.last_used, a.activity.last_used));
     let i = 0;
-    const r: JSX.Element[] = [];
+    const r: React.JSX.Element[] = [];
     for (const { account_id, activity } of v) {
       // only show other users
       if (account_id !== our_account_id) {

src/packages/frontend/account/editor-settings/autosave-interval.tsx

@@ -12,7 +12,7 @@ interface Props {
   on_change: (string, number) => void;
 }
 
-export function EditorSettingsAutosaveInterval(props: Props): JSX.Element {
+export function EditorSettingsAutosaveInterval(props: Props): React.JSX.Element {
   const intl = useIntl();
 
   return (

src/packages/frontend/account/editor-settings/color-schemes.tsx

@@ -20,7 +20,7 @@ interface Props {
   font_size?: number;
 }
 
-export function EditorSettingsColorScheme(props: Props): JSX.Element {
+export function EditorSettingsColorScheme(props: Props): React.JSX.Element {
   const intl = useIntl();
 
   return (

src/packages/frontend/account/editor-settings/indent-size.tsx

@@ -12,7 +12,7 @@ interface Props {
   on_change: (name: string, value: number) => void;
 }
 
-export function EditorSettingsIndentSize(props: Props): JSX.Element {
+export function EditorSettingsIndentSize(props: Props): React.JSX.Element {
   const intl = useIntl();
 
   return (

src/packages/frontend/account/editor-settings/keyboard-bindings.tsx

@@ -13,7 +13,7 @@ interface Props {
   on_change: (selected: string) => void;
 }
 
-export function EditorSettingsKeyboardBindings(props: Props): JSX.Element {
+export function EditorSettingsKeyboardBindings(props: Props): React.JSX.Element {
   const intl = useIntl();
 
   const label = intl.formatMessage({

src/packages/frontend/account/editor-settings/x11-keyboard.tsx

@@ -19,7 +19,7 @@ interface PhysicalKeyboardProps {
 
 export function EditorSettingsPhysicalKeyboard(
   props: PhysicalKeyboardProps,
-): JSX.Element {
+): React.JSX.Element {
   const intl = useIntl();
 
   if (props.physical_keyboard === "NO_DATA") {
@@ -51,7 +51,7 @@ interface KeyboardVariantProps {
 
 export function EditorSettingsKeyboardVariant(
   props: KeyboardVariantProps,
-): JSX.Element {
+): React.JSX.Element {
   const intl = useIntl();
 
   if (props.keyboard_variant === "NO_DATA") {

src/packages/frontend/account/keyboard-settings.tsx

@@ -32,8 +32,8 @@ export const KeyboardSettings: React.FC = () => {
   const intl = useIntl();
   const evaluate_key = useTypedRedux("account", "evaluate_key");
 
-  function render_keyboard_shortcuts(): JSX.Element[] {
-    const v: JSX.Element[] = [];
+  function render_keyboard_shortcuts(): React.JSX.Element[] {
+    const v: React.JSX.Element[] = [];
     for (const { command, shortcut } of KEYBOARD_SHORTCUTS) {
       const key = command.id;
       const label = intl.formatMessage(command);
@@ -50,7 +50,7 @@ export const KeyboardSettings: React.FC = () => {
     set_account_table({ evaluate_key: value });
   }
 
-  function render_eval_shortcut(): JSX.Element {
+  function render_eval_shortcut(): React.JSX.Element {
     if (evaluate_key == null) {
       return <Loading />;
     }

src/packages/frontend/account/other-settings.tsx

@@ -60,7 +60,7 @@ interface Props {
   kucalc: string;
 }
 
-export function OtherSettings(props: Readonly<Props>): JSX.Element {
+export function OtherSettings(props: Readonly<Props>): React.JSX.Element {
   const intl = useIntl();
   const { locale } = useLocalizationCtx();
   const isCoCalcCom = useTypedRedux("customize", "is_cocalc_com");