Yuki Takei 5 лет назад
Родитель
Сommit
0881aaaeb2

+ 3 - 3
src/client/js/components/Hotkeys/HotkeysManager.jsx

@@ -9,9 +9,9 @@ import PageEdit from '../PageHotkeys/PageEdit';
 
 
 // define supported components list
 // define supported components list
 const SUPPORTED_COMPONENTS = [
 const SUPPORTED_COMPONENTS = [
-  StaffCredit,
-  MirrorMode,
-  ShowHotkeys,
+  // StaffCredit,
+  // MirrorMode,
+  // ShowHotkeys,
   PageCreate,
   PageCreate,
   PageEdit,
   PageEdit,
 ];
 ];

+ 20 - 31
src/client/js/components/PageHotkeys/PageCreate.jsx

@@ -1,42 +1,31 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import PropTypes from 'prop-types';
 import PropTypes from 'prop-types';
+
 import NavigationContainer from '../../services/NavigationContainer';
 import NavigationContainer from '../../services/NavigationContainer';
 import { withUnstatedContainers } from '../UnstatedUtils';
 import { withUnstatedContainers } from '../UnstatedUtils';
 
 
+const PageCreate = (props) => {
 
 
-/**
- *
- * @export
- * @extends {React.Component}
- */
-
-export default class PageCreate extends React.Component {
-
-  // when this is called it returns the hotkey stroke
-  static getHotkeyStroke() {
-    return [['c']];
-  }
-
-  static getComponent() {
-    const PageCreateWrapper = withUnstatedContainers(PageCreate, [NavigationContainer]);
-    return <PageCreateWrapper />;
-  }
-
-  componentDidMount() {
-    this.props.navigationContainer.openPageCreateModal();
-    return null;
-  }
-
-  render() {
-    return (
-      <React.Fragment>
-      </React.Fragment>
-    );
-  }
+  // setup effect
+  useEffect(() => {
+    props.navigationContainer.openPageCreateModal();
 
 
-}
+    // remove this
+    props.onDeleteRender(this);
+  }, [props]);
 
 
+  return <></>;
+};
 
 
 PageCreate.propTypes = {
 PageCreate.propTypes = {
   navigationContainer: PropTypes.instanceOf(NavigationContainer).isRequired,
   navigationContainer: PropTypes.instanceOf(NavigationContainer).isRequired,
+  onDeleteRender: PropTypes.func.isRequired,
 };
 };
+
+const PageCreateWrapper = withUnstatedContainers(PageCreate, [NavigationContainer]);
+
+PageCreateWrapper.getHotkeyStrokes = () => {
+  return [['c']];
+};
+
+export default PageCreateWrapper;

+ 4 - 4
src/client/js/components/PageHotkeys/PageEdit.jsx

@@ -19,12 +19,12 @@ const PageEdit = (props) => {
   return <></>;
   return <></>;
 };
 };
 
 
-PageEdit.getHotkeyStrokes = () => {
-  return [['e']];
-};
-
 PageEdit.propTypes = {
 PageEdit.propTypes = {
   onDeleteRender: PropTypes.func.isRequired,
   onDeleteRender: PropTypes.func.isRequired,
 };
 };
 
 
+PageEdit.getHotkeyStrokes = () => {
+  return [['e']];
+};
+
 export default PageEdit;
 export default PageEdit;