dev: [SimpleEditor] add props: appendInnerBar and type both

eslib/Editor/index.d.ts

@@ -11,12 +11,13 @@ interface ToolListItem {
     render?: (i: ToolListItem, innerIcon: any, innerText: any, divWrapStyle: React.CSSProperties | undefined) => any;
 }
 interface SimpleEditorProps extends BaseEditorProps {
-    toolAlign?: "inner" | "bottom";
+    toolAlign?: "inner" | "bottom" | "both";
     toolList?: Array<ToolListItem>;
     injectControlsToolBar?: any;
     injectBraftEditorProps?: any;
     toolBarContainerStyle?: any;
     appendToolBtn?: any;
+    appendInnderBar?: any;
 }
 declare const SimpleEditor: (props: SimpleEditorProps) => JSX.Element;
 export { default as BraftEditor } from "../BraftEditor/index";

eslib/Editor/index.js

@@ -124,7 +124,9 @@ var SimpleEditor = function SimpleEditor(props) {
       _props$injectBraftEdi = props.injectBraftEditorProps,
       injectBraftEditorProps = _props$injectBraftEdi === void 0 ? {} : _props$injectBraftEdi,
       _props$appendToolBtn = props.appendToolBtn,
-      appendToolBtn = _props$appendToolBtn === void 0 ? null : _props$appendToolBtn;
+      appendToolBtn = _props$appendToolBtn === void 0 ? null : _props$appendToolBtn,
+      _props$appendInnderBa = props.appendInnderBar,
+      appendInnderBar = _props$appendInnderBa === void 0 ? null : _props$appendInnderBa;
 
   if (toolAlign === 'inner') {
     return React.createElement(BarftEditorPage, Object.assign({
@@ -143,6 +145,25 @@ var SimpleEditor = function SimpleEditor(props) {
     }, injectBraftEditorProps));
   }
 
+  if (toolAlign === 'both') {
+    return React.createElement("div", null, React.createElement(BarftEditorPage, Object.assign({
+      value: value,
+      onChange: onChange,
+      controls: [],
+      FloatControls: {
+        appendInnderBar: appendInnderBar
+      }
+    }, injectBraftEditorProps)), React.createElement("div", {
+      style: toolBarContainerStyle
+    }, React.createElement("div", {
+      className: styles.bottomToolBarWrapper
+    }, React.createElement(ControlsToolBar, Object.assign({
+      editorState: value,
+      setEditorState: onChange,
+      toolList: toolList
+    }, injectControlsToolBar))), appendToolBtn));
+  }
+
   return React.createElement("div", null, React.createElement(BarftEditorPage, Object.assign({
     value: value,
     onChange: onChange,

lib/Editor/index.d.ts

@@ -11,12 +11,13 @@ interface ToolListItem {
     render?: (i: ToolListItem, innerIcon: any, innerText: any, divWrapStyle: React.CSSProperties | undefined) => any;
 }
 interface SimpleEditorProps extends BaseEditorProps {
-    toolAlign?: "inner" | "bottom";
+    toolAlign?: "inner" | "bottom" | "both";
     toolList?: Array<ToolListItem>;
     injectControlsToolBar?: any;
     injectBraftEditorProps?: any;
     toolBarContainerStyle?: any;
     appendToolBtn?: any;
+    appendInnderBar?: any;
 }
 declare const SimpleEditor: (props: SimpleEditorProps) => JSX.Element;
 export { default as BraftEditor } from "../BraftEditor/index";

lib/Editor/index.js

@@ -130,7 +130,9 @@ var SimpleEditor = function SimpleEditor(props) {
       _props$injectBraftEdi = props.injectBraftEditorProps,
       injectBraftEditorProps = _props$injectBraftEdi === void 0 ? {} : _props$injectBraftEdi,
       _props$appendToolBtn = props.appendToolBtn,
-      appendToolBtn = _props$appendToolBtn === void 0 ? null : _props$appendToolBtn;
+      appendToolBtn = _props$appendToolBtn === void 0 ? null : _props$appendToolBtn,
+      _props$appendInnderBa = props.appendInnderBar,
+      appendInnderBar = _props$appendInnderBa === void 0 ? null : _props$appendInnderBa;
 
   if (toolAlign === 'inner') {
     return React__default.createElement(BraftEditor$1.BarftEditorPage, Object.assign({
@@ -149,6 +151,25 @@ var SimpleEditor = function SimpleEditor(props) {
     }, injectBraftEditorProps));
   }
 
+  if (toolAlign === 'both') {
+    return React__default.createElement("div", null, React__default.createElement(BraftEditor$1.BarftEditorPage, Object.assign({
+      value: value,
+      onChange: onChange,
+      controls: [],
+      FloatControls: {
+        appendInnderBar: appendInnderBar
+      }
+    }, injectBraftEditorProps)), React__default.createElement("div", {
+      style: toolBarContainerStyle
+    }, React__default.createElement("div", {
+      className: styles.bottomToolBarWrapper
+    }, React__default.createElement(ControlsToolBar, Object.assign({
+      editorState: value,
+      setEditorState: onChange,
+      toolList: toolList
+    }, injectControlsToolBar))), appendToolBtn));
+  }
+
   return React__default.createElement("div", null, React__default.createElement(BraftEditor$1.BarftEditorPage, Object.assign({
     value: value,
     onChange: onChange,

src/components/Editor/ImgTxtEditor/SimpleEditor.tsx

@@ -5,12 +5,13 @@ import { ContentUtils } from "braft-utils";
 import styles from './index.less';
 
 interface SimpleEditorProps extends BaseEditorProps {
-  toolAlign?: 'inner' | 'bottom';
+  toolAlign?: 'inner' | 'bottom' | 'both';
   toolList?: Array<ToolListItem>;
   injectControlsToolBar?: any;
   injectBraftEditorProps?: any;
   toolBarContainerStyle?: any;
   appendToolBtn?: any;
+  appendInnderBar?: any;
 }
 
 const SimpleEditor = (props: SimpleEditorProps) => {
@@ -23,6 +24,7 @@ const SimpleEditor = (props: SimpleEditorProps) => {
     toolBarContainerStyle = {},
     injectBraftEditorProps = {},
     appendToolBtn = null,
+    appendInnderBar = null,
   } = props;
 
 
@@ -45,6 +47,31 @@ const SimpleEditor = (props: SimpleEditorProps) => {
     )
   }
 
+  if (toolAlign === 'both') {
+    return (
+      <div>
+        <BarftEditorPage
+          value={value}
+          onChange={onChange}
+          controls={[]}
+          FloatControls={{appendInnderBar}}
+          {...injectBraftEditorProps}
+        />
+        <div style={toolBarContainerStyle}>
+          <div className={styles.bottomToolBarWrapper}>
+            <ControlsToolBar
+              editorState={value}
+              setEditorState={onChange}
+              toolList={toolList}
+              {...injectControlsToolBar}
+            />
+          </div>
+          {appendToolBtn}
+        </div>
+      </div>
+    )
+  }
+
   return (
     <div>
       <BarftEditorPage