Skip to content

Commit 0ea68be

Browse files
committed
Merge branch 'master' into conat-supercluster
2 parents ff7340d + e7f4e4f commit 0ea68be

File tree

297 files changed

+2516
-2240
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

297 files changed

+2516
-2240
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ export const AccountPage: React.FC = () => {
235235
);
236236
}
237237

238-
function render_logged_in_view(): JSX.Element {
238+
function render_logged_in_view(): React.JSX.Element {
239239
if (!account_id) {
240240
return (
241241
<div style={{ textAlign: "center", paddingTop: "15px" }}>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export const AccountPreferences: React.FC = () => {
4343
const kucalc = useTypedRedux("customize", "kucalc");
4444
const ssh_gateway = useTypedRedux("customize", "ssh_gateway");
4545

46-
function render_account_settings(): JSX.Element {
46+
function render_account_settings(): React.JSX.Element {
4747
return (
4848
<AccountSettings
4949
account_id={account_id}
@@ -65,7 +65,7 @@ export const AccountPreferences: React.FC = () => {
6565
);
6666
}
6767

68-
function render_other_settings(): JSX.Element {
68+
function render_other_settings(): React.JSX.Element {
6969
if (other_settings == null) return <Loading />;
7070
return (
7171
<OtherSettings
@@ -78,7 +78,7 @@ export const AccountPreferences: React.FC = () => {
7878
);
7979
}
8080

81-
function renderDarkMode(): JSX.Element {
81+
function renderDarkMode(): React.JSX.Element {
8282
return (
8383
<Tooltip title="Enable dark mode across the entire user interface. See further dark mode configuration below.">
8484
<Form style={{ height: "37px" }}>
@@ -120,7 +120,7 @@ export const AccountPreferences: React.FC = () => {
120120
);
121121
}
122122

123-
function render_all_settings(): JSX.Element {
123+
function render_all_settings(): React.JSX.Element {
124124
return (
125125
<>
126126
<Flex>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ export function UsersViewing(props: Readonly<Props>) {
126126
}
127127
v.sort((a, b) => cmp(b.activity.last_used, a.activity.last_used));
128128
let i = 0;
129-
const r: JSX.Element[] = [];
129+
const r: React.JSX.Element[] = [];
130130
for (const { account_id, activity } of v) {
131131
// only show other users
132132
if (account_id !== our_account_id) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ interface Props {
1212
on_change: (string, number) => void;
1313
}
1414

15-
export function EditorSettingsAutosaveInterval(props: Props): JSX.Element {
15+
export function EditorSettingsAutosaveInterval(props: Props): React.JSX.Element {
1616
const intl = useIntl();
1717

1818
return (

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ interface Props {
2020
font_size?: number;
2121
}
2222

23-
export function EditorSettingsColorScheme(props: Props): JSX.Element {
23+
export function EditorSettingsColorScheme(props: Props): React.JSX.Element {
2424
const intl = useIntl();
2525

2626
return (

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ interface Props {
1212
on_change: (name: string, value: number) => void;
1313
}
1414

15-
export function EditorSettingsIndentSize(props: Props): JSX.Element {
15+
export function EditorSettingsIndentSize(props: Props): React.JSX.Element {
1616
const intl = useIntl();
1717

1818
return (

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ interface Props {
1313
on_change: (selected: string) => void;
1414
}
1515

16-
export function EditorSettingsKeyboardBindings(props: Props): JSX.Element {
16+
export function EditorSettingsKeyboardBindings(props: Props): React.JSX.Element {
1717
const intl = useIntl();
1818

1919
const label = intl.formatMessage({

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ interface PhysicalKeyboardProps {
1919

2020
export function EditorSettingsPhysicalKeyboard(
2121
props: PhysicalKeyboardProps,
22-
): JSX.Element {
22+
): React.JSX.Element {
2323
const intl = useIntl();
2424

2525
if (props.physical_keyboard === "NO_DATA") {
@@ -51,7 +51,7 @@ interface KeyboardVariantProps {
5151

5252
export function EditorSettingsKeyboardVariant(
5353
props: KeyboardVariantProps,
54-
): JSX.Element {
54+
): React.JSX.Element {
5555
const intl = useIntl();
5656

5757
if (props.keyboard_variant === "NO_DATA") {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ export const KeyboardSettings: React.FC = () => {
3232
const intl = useIntl();
3333
const evaluate_key = useTypedRedux("account", "evaluate_key");
3434

35-
function render_keyboard_shortcuts(): JSX.Element[] {
36-
const v: JSX.Element[] = [];
35+
function render_keyboard_shortcuts(): React.JSX.Element[] {
36+
const v: React.JSX.Element[] = [];
3737
for (const { command, shortcut } of KEYBOARD_SHORTCUTS) {
3838
const key = command.id;
3939
const label = intl.formatMessage(command);
@@ -50,7 +50,7 @@ export const KeyboardSettings: React.FC = () => {
5050
set_account_table({ evaluate_key: value });
5151
}
5252

53-
function render_eval_shortcut(): JSX.Element {
53+
function render_eval_shortcut(): React.JSX.Element {
5454
if (evaluate_key == null) {
5555
return <Loading />;
5656
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ interface Props {
6060
kucalc: string;
6161
}
6262

63-
export function OtherSettings(props: Readonly<Props>): JSX.Element {
63+
export function OtherSettings(props: Readonly<Props>): React.JSX.Element {
6464
const intl = useIntl();
6565
const { locale } = useLocalizationCtx();
6666
const isCoCalcCom = useTypedRedux("customize", "is_cocalc_com");

0 commit comments

Comments
 (0)