Skip to content
This repository has been archived by the owner on Jun 10, 2024. It is now read-only.

feat: lazy loading to modals #358

Open
wants to merge 1 commit into
base: epic-v2-save-load
Choose a base branch
from
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
41 changes: 32 additions & 9 deletions src/components/Main.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,43 @@
import { Button, HelpButton, Logo, ZoomButtons } from './components';
import { CameraToolbar } from './viewport';
import { Compass32Icon } from '../icons';
import { Component } from 'react';
import React, { Component } from 'react';
import ComponentsSidebar from './components/Sidebar';
import Events from '../lib/Events';
import { ModalHelp } from './modals/ModalHelp';
import ModalTextures from './modals/ModalTextures';
import SceneGraph from './scenegraph/SceneGraph';
import { ScreenshotModal } from './modals/ScreenshotModal';
import TransformToolbar from './viewport/TransformToolbar';
// import ViewportHUD from "./viewport/ViewportHUD";
import { injectCSS } from '../lib/utils';
import { SignInModal } from './modals/SignInModal';
import { ProfileModal } from './modals/ProfileModal';
import { ScenesModal } from './modals/ScenesModal';
import { SceneEditTitle } from './components/SceneEditTitle';
import { TransformToolbar } from './viewport/TransformToolbar';

const ModalHelp = React.lazy(() =>
import('./modals/ModalHelp').then((module) => ({ default: module.ModalHelp }))
);
const ModalTextures = React.lazy(() =>
import('./modals/ModalTextures/ModalTextures').then((module) => ({
default: module.ModalTextures
}))
);
const ScreenshotModal = React.lazy(() =>
import('./modals/ScreenshotModal').then((module) => ({
default: module.ScreenshotModal
}))
);
const SignInModal = React.lazy(() =>
import('./modals/SignInModal').then((module) => ({
default: module.SignInModal
}))
);
const ProfileModal = React.lazy(() =>
import('./modals/ProfileModal').then((module) => ({
default: module.ProfileModal
}))
);
const ScenesModal = React.lazy(() =>
import('./modals/ScenesModal').then((module) => ({
default: module.ScenesModal
}))
);

THREE.ImageUtils.crossOrigin = '';
// Megahack to include font-awesome.
injectCSS(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React from 'react';
import PropTypes from 'prop-types';
import Events from '../../lib/Events';
import Modal from './Modal.jsx';
import { insertNewAsset } from '../../lib/assetsUtils';
import Events from '../../../lib/Events.js';
import Modal from '../Modal.jsx';
import { insertNewAsset } from '../../../lib/assetsUtils.js';

function getFilename(url, converted = false) {
var filename = url.split('/').pop();
Expand All @@ -29,7 +29,7 @@ function getValidId(name) {
.toLowerCase();
}

export default class ModalTextures extends React.Component {
class ModalTextures extends React.Component {
static propTypes = {
isOpen: PropTypes.bool,
onClose: PropTypes.func,
Expand Down Expand Up @@ -426,3 +426,5 @@ export default class ModalTextures extends React.Component {
);
}
}

export { ModalTextures };
1 change: 1 addition & 0 deletions src/components/modals/ModalTextures/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { ModalTextures } from './ModalTextures.js';
4 changes: 3 additions & 1 deletion src/components/viewport/TransformToolbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ var TransformButtons = [
{ value: 'scale', icon: 'fa-expand' }
];

export default class TransformToolbar extends React.Component {
class TransformToolbar extends React.Component {
constructor(props) {
super(props);
this.state = {
Expand Down Expand Up @@ -94,3 +94,5 @@ export default class TransformToolbar extends React.Component {
);
}
}

export { TransformToolbar };
9 changes: 3 additions & 6 deletions webpack.prod.config.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
const path = require('path');
const MiniCssExtractPlugin = require('mini-css-extract-plugin');
const Dotenv = require('dotenv-webpack');
const TerserPlugin = require('terser-webpack-plugin');
const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
const { CleanWebpackPlugin } = require('clean-webpack-plugin');
const HtmlWebpackPlugin = require('html-webpack-plugin');

Expand All @@ -15,10 +13,9 @@ module.exports = {
publicPath: '/'
},
// optimization: {
// minimizer: [new TerserPlugin(), new CssMinimizerPlugin({})]
// // splitChunks: {
// // chunks: 'all'
// // }
// splitChunks: {
// chunks: 'all'
// }
// },
plugins: [
new CleanWebpackPlugin(),
Expand Down