Skip to content

Commit 7f7bff9

Browse files
committed
ui: remove deprecated util global
1 parent d1e47ba commit 7f7bff9

23 files changed

Lines changed: 9 additions & 80 deletions

packages/ui-default/api.ts

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
export * from './components/dialog';
33
export { default as loadMonaco } from './components/monaco/loader';
44
export { default as Notification } from './components/notification';
5+
export { default as selectUser } from './components/selectUser';
56
export { default as Socket } from './components/socket/index';
67
export { default as uploadFiles } from './components/upload';
78
export * from './components/zipDownloader';
@@ -16,11 +17,15 @@ export { AnsiUp } from 'ansi_up';
1617
export { default as $ } from 'jquery';
1718
export { default as _ } from 'lodash';
1819
export { default as React } from 'react';
19-
export { default as ReactDOM } from 'react-dom/client';
2020
export * as redux from 'react-redux';
2121
export { default as jsxRuntime } from 'react/jsx-runtime';
22+
import ReactDOMMain from 'react-dom';
23+
import ReactDOMClient from 'react-dom/client';
2224
import { load } from './lazyload';
2325

26+
Object.assign(ReactDOMMain, ReactDOMClient);
27+
28+
export const ReactDOM = ReactDOMMain as typeof ReactDOMMain & typeof ReactDOMClient;
2429
export default load;
2530
export interface EventMap { }
2631

@@ -51,19 +56,5 @@ declare global {
5156

5257
// Below are old version api compat
5358
import $ from 'jquery';
54-
import _ from 'lodash';
55-
import React from 'react';
56-
import ReactDOM from 'react-dom/client';
57-
import * as redux from 'react-redux';
58-
59-
const modules = {
60-
_, $, React, redux, ReactDOM,
61-
};
62-
63-
declare global {
64-
interface Window {
65-
node_modules: typeof modules;
66-
}
67-
}
6859

69-
Object.assign(window, { node_modules: modules, $, jQuery: $ });
60+
Object.assign(window, { $, jQuery: $ });

packages/ui-default/components/autocomplete/AssignSelectAutoComplete.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,3 @@ export default class AssignSelectAutoComplete<Multi extends boolean> extends Aut
2020
return this.ref?.getSelectedItemKeys().join(',') ?? this.$dom.val();
2121
}
2222
}
23-
24-
window.Hydro.components.AssignSelectAutoComplete = AssignSelectAutoComplete;

packages/ui-default/components/autocomplete/CustomSelectAutoComplete.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,3 @@ export default class CustomSelectAutoComplete<Multi extends boolean> extends Aut
2121
});
2222
}
2323
}
24-
25-
window.Hydro.components.CustomSelectAutoComplete = CustomSelectAutoComplete;

packages/ui-default/components/autocomplete/DomainSelectAutoComplete.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,3 @@ export default class DomainSelectAutoComplete<Multi extends boolean> extends Aut
1616
});
1717
}
1818
}
19-
20-
window.Hydro.components.DomainSelectAutoComplete = DomainSelectAutoComplete;

packages/ui-default/components/autocomplete/FileSelectAutoComplete.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,3 @@ export default class FileSelectAutoComplete<Multi extends boolean> extends AutoC
2424
});
2525
}
2626
}
27-
28-
window.Hydro.components.FileSelectAutoComplete = FileSelectAutoComplete;

packages/ui-default/components/autocomplete/LanguageSelectAutoComplete.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,3 @@ export default class LanguageSelectAutoComplete<Multi extends boolean> extends A
2222
});
2323
}
2424
}
25-
26-
window.Hydro.components.LanguageSelectAutoComplete = LanguageSelectAutoComplete;

packages/ui-default/components/autocomplete/ProblemSelectAutoComplete.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,3 @@ export default class ProblemSelectAutoComplete extends AutoComplete {
1616
});
1717
}
1818
}
19-
20-
window.Hydro.components.ProblemSelectAutoComplete = ProblemSelectAutoComplete;

packages/ui-default/components/autocomplete/UserSelectAutoComplete.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,3 @@ export default class UserSelectAutoComplete<Multi extends boolean> extends AutoC
2121
return this.ref?.getSelectedItems()[0] ?? null;
2222
}
2323
}
24-
25-
window.Hydro.components.UserSelectAutoComplete = UserSelectAutoComplete;

packages/ui-default/components/autocomplete/index.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,5 +108,3 @@ export default class AutoComplete<Options extends Record<string, any> = object,
108108
this.ref.focus();
109109
}
110110
}
111-
112-
window.Hydro.components.autocomplete = AutoComplete;

packages/ui-default/components/dialog/index.tsx

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -262,11 +262,3 @@ export async function alert(text: string) {
262262
$body: tpl.typoMsg(text),
263263
}).open();
264264
}
265-
266-
window.Hydro.components.Dialog = Dialog;
267-
window.Hydro.components.InfoDialog = InfoDialog;
268-
window.Hydro.components.ActionDialog = ActionDialog;
269-
window.Hydro.components.ConfirmDialog = ConfirmDialog;
270-
window.Hydro.components.prompt = prompt;
271-
window.Hydro.components.confirm = confirm;
272-
window.Hydro.components.alert = alert;

0 commit comments

Comments
 (0)