Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions apps/meteor/client/startup/appRoot.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { StrictMode } from 'react';
import { render } from 'react-dom';
import { createRoot } from 'react-dom/client';

import AppRoot from '../views/root/AppRoot';

Expand All @@ -16,10 +16,10 @@ const createContainer = (): Element => {
};

const container = createContainer();
const root = createRoot(container);

render(
root.render(
<StrictMode>
<AppRoot />
</StrictMode>,
container,
);
</StrictMode>
);
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
import { useRoute, useRouteParameter } from '@rocket.chat/ui-contexts';
import React, { useEffect } from 'react';
import React, { useInsertionEffect } from 'react';

import { businessHourManager } from '../../../../app/livechat/client/views/app/business-hours/BusinessHours';
import { useReactiveValue } from '../../../hooks/useReactiveValue';
Expand All @@ -19,7 +19,7 @@ const BusinessHoursRouter = () => {

const router = useRoute('omnichannel-businessHours');

useEffect(() => {
useInsertionEffect(() => {
if (isSingleBH) {
router.push({
context: 'edit',
Expand All @@ -39,4 +39,4 @@ const BusinessHoursRouter = () => {
return <BusinessHoursPage />;
};

export default BusinessHoursRouter;
export default BusinessHoursRouter;
6 changes: 3 additions & 3 deletions packages/livechat/src/components/Screen/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useEffect } from 'preact/hooks';
import { useInsertionEffect } from 'preact/hooks';

import ChatIcon from '../../icons/chat.svg';
import CloseIcon from '../../icons/close.svg';
Expand Down Expand Up @@ -38,7 +38,7 @@ const ChatButton = ({ text, minimized, badge, onClick, triggered = false, agent
);

const CssVar = ({ theme }) => {
useEffect(() => {
useInsertionEffect(() => {
if (window.CSS && CSS.supports('color', 'var(--color)')) {
return;
}
Expand Down Expand Up @@ -147,4 +147,4 @@ export const Screen = ({
Screen.Content = ScreenContent;
Screen.Footer = ScreenFooter;

export default Screen;
export default Screen;
4 changes: 2 additions & 2 deletions packages/livechat/svg-component-loader.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ var content = module.exports.content;
module.exports = function (props) {
var ref = hooks.useRef();

hooks.useEffect(function () {
hooks.useInsertionEffect(function () {
var div = document.createElement('div');
div.innerHTML = '<svg>' + content + '</svg>';

Expand All @@ -22,4 +22,4 @@ module.exports = function (props) {

return preact.h('svg', Object.assign({ ref: ref }, attributes, props));
};
`;
`;
11 changes: 6 additions & 5 deletions packages/uikit-playground/src/main.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
import React from 'react';
import ReactDOM from 'react-dom';
import { createRoot } from 'react-dom/client';
import '@rocket.chat/icons/dist/rocketchat.css';

import './index.css';
import App from './App';
import { Provider } from './Context';

ReactDOM.render(
const container = document.getElementById('root');
const root = createRoot(container);
root.render(
<React.StrictMode>
<Provider>
<App />
</Provider>
</React.StrictMode>,
document.getElementById('root'),
);
</React.StrictMode>
);