@seafile/seafile-editor 0.3.100 → 0.3.101

package/README.md

@@ -1,119 +1,51 @@
-This project was bootstrapped with [Create React App](https://github.com/facebookincubator/create-react-app).
+# Seafile-editor
 
-## Folder Structure
+项目是基于 react-slate 组件库的二次封装, 用于满足公司富文本编辑器的使用需求
 
-After creation, your project should look like this:
+## 目录结构
 
 ```
 seafile-editor/
-  README.md
-  node_modules/
-  package.json
-  public/
-    index.html
+  dist                      // 打包后的文件
+  node_modules/             // 依赖第三方组件库
+  public/                   // 公共资源文件库
+    index.html                 
     favicon.ico
-  src/
-    App.css
-    App.js
-    App.test.js
-    index.css
-    index.js
-    logo.svg
-```
-
-For the project to build, **these files must exist with exact filenames**:
-
-* `public/index.html` is the page template;
-* `src/index.js` is the JavaScript entry point.
-
-You can delete or rename the other files.
-
-You may create subdirectories inside `src`. For faster rebuilds, only files inside `src` are processed by Webpack.<br>
-You need to **put any JS and CSS files inside `src`**, otherwise Webpack won’t see them.
-
-Only files inside `public` can be used from `public/index.html`.<br>
-Read instructions below for using assets from JavaScript and HTML.
-
-You can, however, create more top-level directories.<br>
-They will not be included in the production build so you can use them for things like documentation.
-
-## Quick Start
-
-Install dependency
-
-```
-npm install
-```
-
-create `src/config.js` with the following contents
-
-```
-const serverConfig = {
-  serviceUrl: "https://download.seafile.top",
-  username: "xxx",
-  password: "xxx",
-  repoID: "xxxxxxx-xxxx-xxx-xxx-xxxx",
-  userInfo: {
-    username: 'xxx',
-    name: 'xxx',
-    contact_email: 'xxxx',
-  },
-  filePath: '/demo.md',
-  fileName: 'demo.md',
-  dirPath: '/'
-}
-
-export { serverConfig }
-```
-
-Make sure you have a file `test.md` in the root of your Seafile library.
-
-Start the example application
-
-```
-npm start
+  site(demo 模块, 基于组件库创建的测试模块)
+    _i18n                   // 国际化模块
+    api                     // api 模块
+    assets                  // css 文件, 图片文件
+    commons                 // 公共组件
+    components              // 应用组件
+    containers              // 容器组件
+    pages                   // 页面组件
+    app.js                  // 应用对象
+    index.html              // 主页
+    index.js                // 应用入口
+    setting.js              // 应用配置文件
+    setting.local.dist.js   // 应用配置模版
+    setting.local.dist      // 用户基于 setting.local.dist.js copy 一份的配置文件
+  src/(组件库)
+    assets                  // css 文件, 资源文件
+    components              // 封装的视图组件
+    editor                  // 封装的编辑器组件
+    lib                     // 底层接口
+    utils                   // 工具接口
+    viewer                  // 封装的视图组件
+    index.js                // 组件库导出内容入口文件
+  tests                     // 测试
+  webpack                   // site 打包文件   
+  config.js                 // site 打包配置文件
+  dev-server.js             // site 后端服务器
+  package.json
+  readme.md                 // 组件库说明文档
 ```
 
+## 本地测试步骤
+1. 新增本地配置文件 setting.local.js(基于 /site/setting.local.dist.js copy 一份)
+2. 在 seahub 项目创建一个测试文件, 根据需要的配置信息完善配置内容
+3. 执行 npm run start-sit, 启动测试服务, 可以打开相应的网址, 对封装的组件进行测试
 
-## Available Scripts
-
-In the project directory, you can run:
-
-### `npm start`
-
-Runs the app in the development mode.<br>
-Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
-
-The page will reload if you make edits.<br>
-You will also see any lint errors in the console.
-
-### `npm test`
-
-Launches the test runner in the interactive watch mode.<br>
-See the section about [running tests](#running-tests) for more information.
-
-### `npm run build`
-
-Builds the app for production to the `build` folder.<br>
-It correctly bundles React in production mode and optimizes the build for the best performance.
-
-The build is minified and the filenames include the hashes.<br>
-Your app is ready to be deployed!
-
-See the section about [deployment](#deployment) for more information.
-
-### `npm run eject`
-
-**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
-
-If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
-
-Instead, it will copy all the configuration files and the transitive dependencies (Webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
-
-You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
-
-### `npm run prepublish`
-
-Run this command before publish to npm registry. And increase verison number in `package.json`.
-
-Publish project by `npm publish` and view at [package page](https://www.npmjs.com/package/@seafile/seafile-editor).
+## 新版本发布
+1. 更新 package.json 中的 version 属性
+2. 执行 npm publish 完成新版本发布

package/dist/assets/css/topbar.css

@@ -1,29 +1,3 @@
-.seafile-btn-view-review {
-  display: flex;
-  align-items: center;
-}
-
-.seafile-btn-view-review .tag:hover {
-  cursor: pointer;
-}
-
-.topbar-btn-container {
-  display: flex;
-  align-items: center;
-}
-
-.seafile-btn-add-review {
-  margin-right: 10px;
-}
-
-.btn-new-draft {
-  margin-right: 10px;
-}
-
-.collab-users-dropdown.dropdown {
-  margin-right: 6px;
-}
-
 .sf-editor-toolbar {
   height: 39px;
   background-color: #fcfcfc;
@@ -43,6 +17,19 @@
   transform: scale(0.8);
 }
 
+/* reset menu style*/
+.sf-editor-toolbar .menu > * {
+  display: inline-block;
+}
+
+.sf-editor-toolbar .menu > * + * {
+  margin-left: 10px;
+}
+
+.sf-editor-toolbar .menu {
+  margin-right: 20px;
+}
+
 .seafile-btn-group div button {
   border: none;
 }
@@ -68,15 +55,6 @@
   border-color: #e5e5e5;
 }
 
-/*topbar style*/
-.menu > * {
-  display: inline-block;
-}
-
-.menu > * + * {
-  margin-left: 10px;
-}
-
 .btn-active {
   color: #0c0c0c;
   cursor: pointer;
@@ -89,11 +67,18 @@
 .btn-active[data-active='true'] {
   color: #eb8205;
 }
+
 .tableToolBar {
   font-size: 12px;
   display: inline-flex;
 }
 
+.tableToolBar:after {
+  content: '';
+  display: block;
+  clear: both;
+}
+
 .tableToolBar div .symbol {
   font-size: 14px;
 }
@@ -102,10 +87,15 @@
   color: #555555;
 }
 
-.tableToolBar:after {
-  content: '';
-  display: block;
-  clear: both;
+.tableToolBar div:not(first):not(.drop-list) {
+  /*display: inline-block;*/
+  margin-left:10px;
+}
+
+.tableToolBar .table-toolbar-btn {
+  line-height: 28px;
+  padding: 0 15px;
+  height: 30px;
 }
 
 .table-toolbar-group {
@@ -116,11 +106,6 @@
   padding-right: 10px;
 }
 
-.tableToolBar div:not(first):not(.drop-list) {
-  /*display: inline-block;*/
-  margin-left:10px;
-}
-
 .sf-editor-table-btn-wrapper {
   position: relative;
 }
@@ -173,12 +158,6 @@
   background-color: #ffa94d;
 }
 
-/*topbar style*/
-
-.menu {
-  margin-right: 20px;
-}
-
 .rich-menu {
   flex: 1;
   display: flex;
@@ -198,11 +177,6 @@
   padding: 4px 10px;
 }
 
-.editor-info {
-  display: flex;
-  align-items: center;
-}
-
 .button-container {
   height: 100%;
   display: flex;
@@ -258,11 +232,11 @@
   padding: 0 3px;
 }
 
-
 .list-body div {
   display: inline-block;
   line-height: 30px;
 }
+
 .header-list-container .list-dropdown {
   position: absolute;
   left: 0;
@@ -311,72 +285,6 @@
   color: #555555;
 }
 
-.tableToolBar .table-toolbar-btn {
-  line-height: 28px;
-  padding: 0 15px;
-  height: 30px;
-}
-
-.file-go-back {
-  display: inline-block;
-  font-size: 28px;
-  color: #c0c0c0;
-  margin-right: 8px;
-}
-.file-go-back:hover {
-  cursor: pointer;
-}
-.file-go-back i {
-  vertical-align: 5px;
-}
-
-.topbar-file-info {
-  display: inline-block;
-  margin-left: 8px;
-  /*
-    only select file info text
-  */
-  user-select: text;
-}
-.topbar-file-info .file-title {
-  font-size: 1.2rem;
-  font-weight: bold;
-}
-
-.topbar-file-info .file-title .iconfont {
-  font-size: 0.875rem;
-}
-
-.file-title .file-star,
-.file-title .file-internal-link {
-  font-size: 0.875rem;
-  cursor: pointer;
-  margin-left: 0.5rem;
-  vertical-align: text-bottom;
-  color: #999;
-}
-
-.file-title .file-star .star {
-  color: #999;
-}
-
-.topbar-file-info .file-state .file-modifier-name {
-  margin-right: 0.5rem;
-}
-
-.topbar-file-info .file-state .file-modifier-savedraft {
-  margin-left: 0.5rem;
-  color: #888;
-}
-
-.topbar-file-info .file-state {
-  font-size: 0.8125rem;
-}
-
-.file-internal-link:hover {
-  color: #333;
-}
-
 p.tip {
   color: #bbb;
 }
@@ -407,6 +315,7 @@ p.tip {
   background-color: #e5e5e5;
   border-radius: 3px;
 }
+
 .custom-dropdown-list .custom-dropdown-menu {
   position: absolute;
   left: 0;
@@ -420,9 +329,6 @@ p.tip {
   .seafile-md-viewer-main-panel {
     margin: 0 2%;
   }
-  .topbar-file-info .file-title {
-    min-width: 150px;
-  }
   .rich-menu {
     overflow-x: auto;
   }

package/dist/utils/slate2markdown/serialize.js

@@ -17,6 +17,17 @@ var processor = unified().use(stringify, {
   fences: true
 }).use(math);
 
+function _getCodeValue(node) {
+  // code > bold | code > italic
+  // code > bold > italic | code > italic > italic
+  if (node && node.children) {
+    node = node.children[0];
+    return _getCodeValue(node);
+  }
+
+  return node.value;
+}
+
 function _applyMark(node, markString) {
   switch (markString) {
     case 'BOLD':
@@ -34,7 +45,7 @@ function _applyMark(node, markString) {
     case 'CODE':
       return {
         type: 'inlineCode',
-        value: node.value
+        value: _getCodeValue(node)
       };
 
     default:

package/dist/viewer/slate-viewer.js

@@ -4,6 +4,7 @@ import _inherits from "@babel/runtime/helpers/esm/inherits";
 import _createSuper from "@babel/runtime/helpers/esm/createSuper";
 import React from 'react';
 import { Editable, Slate } from '@seafile/slate-react';
+import { Editor } from 'slate';
 import { decorationNode } from '../editor/editor-utils/common-editor-utils';
 import { renderNode, renderLeaf } from '../utils/render-slate';
 import EditorBuilder from '../editor/editor-builder';
@@ -20,15 +21,39 @@ var SlateViewer = /*#__PURE__*/function (_React$Component) {
     _classCallCheck(this, SlateViewer);
 
     _this = _super.call(this, props);
+
+    _this.onChange = function () {// nothing todo
+    };
+
+    _this.scrollToNode = function (node) {
+      var editor = document.querySelector('.viewer-component');
+      var element = editor.childNodes[node.path[0]];
+
+      _this.editorContainerRef.scrollTo(0, element.offsetTop);
+
+      window.location.hash = encodeURI(node.children[0].text);
+      Editor.select(_this.editor, node.path);
+    };
+
+    _this.setEditorContainerRef = function (ref) {
+      _this.editorContainerRef = ref;
+    };
+
     _this.editor = EditorBuilder.getSlateEditor();
     window.viewer = _this.editor;
     return _this;
   }
 
   _createClass(SlateViewer, [{
+    key: "componentDidMount",
+    value: function componentDidMount() {
+      window.abcdef_editor = this;
+    }
+  }, {
     key: "componentWillUnmount",
     value: function componentWillUnmount() {
       EditorBuilder.resetEditor();
+      window.abcdef_editor = null;
     }
   }, {
     key: "render",
@@ -37,11 +62,13 @@ var SlateViewer = /*#__PURE__*/function (_React$Component) {
           value = _this$props.value,
           renderDiffElement = _this$props.renderDiffElement,
           renderDiffLeaf = _this$props.renderDiffLeaf;
-      return /*#__PURE__*/React.createElement("div", {
-        className: "article"
-      }, /*#__PURE__*/React.createElement(Slate, {
+      return /*#__PURE__*/React.createElement(Slate, {
         editor: this.editor,
-        value: value
+        value: value,
+        onChange: this.onChange
+      }, /*#__PURE__*/React.createElement("div", {
+        className: "article",
+        ref: this.setEditorContainerRef
       }, /*#__PURE__*/React.createElement(Editable, {
         readOnly: true,
         className: 'viewer-component',

package/package.json

@@ -1,13 +1,12 @@
 {
   "name": "@seafile/seafile-editor",
-  "version": "0.3.100",
+  "version": "0.3.101",
   "private": false,
   "dependencies": {
     "@seafile/react-image-lightbox": "^0.0.9",
     "@seafile/slate-react": "^0.54.13",
     "codemirror": "^5.37.0",
     "crypto-js": "^3.1.9-1",
-    "dayjs": "1.10.7",
     "deep-equal": "^1.0.1",
     "deepmerge": "^2.1.0",
     "detect-indent": "^4.0.0",
@@ -42,8 +41,6 @@
     "remark-parse": "^5.0.0",
     "remark-rehype": "^3.0.0",
     "remark-slug": "^5.0.0",
-    "seafile-js": "0.2.168",
-    "seafile-ui": "^0.1.10",
     "slate": "^0.54.2",
     "slate-history": "^0.54.2",
     "slate-hotkeys": "0.2.3",
@@ -56,10 +53,11 @@
   "scripts": {
     "clean": "rm -rf dist && mkdir dist",
     "start": "node scripts/start.js",
+    "start-site": "export NODE_ENV=development LOG_ENV=rc && node dev-server.js",
     "build": "node scripts/build.js",
     "pub:dist": "export BABEL_ENV=production && ./node_modules/.bin/babel src --out-dir dist --copy-files",
     "pub:optimized": "rm dist/config.js",
-    "prepublishOnly": "npm run clean && npm run pub:dist && npm run pub:optimized",
+    "prepublishOnly": "npm run clean && npm run pub:dist",
     "test": "node scripts/test.js --env=jsdom"
   },
   "jest": {
@@ -133,9 +131,13 @@
     "browserslist": "^4.8.0",
     "camelcase": "^5.2.0",
     "case-sensitive-paths-webpack-plugin": "2.2.0",
+    "clean-webpack-plugin": "4.0.0",
+    "core-js": "2.6.12",
     "css-loader": "^3.2.1",
+    "dayjs": "1.11.2",
     "dotenv": "6.2.0",
     "dotenv-expand": "5.1.0",
+    "ejs": "3.1.8",
     "enzyme": "^3.10.0",
     "enzyme-adapter-react-16": "^1.15.1",
     "eslint": "^6.1.0",
@@ -156,6 +158,9 @@
     "jest-environment-jsdom-fourteen": "0.1.0",
     "jest-resolve": "24.9.0",
     "jest-watch-typeahead": "0.4.0",
+    "koa": "2.13.4",
+    "koa-router": "7.3.0",
+    "koa-send": "5.0.1",
     "mini-css-extract-plugin": "^0.5.0",
     "optimize-css-assets-webpack-plugin": "5.0.3",
     "pnp-webpack-plugin": "1.5.0",
@@ -168,17 +173,21 @@
     "raf": "3.4.0",
     "react-app-polyfill": "^1.0.4",
     "react-dev-utils": "^9.1.0",
+    "react-hot-loader": "4.13.0",
     "resolve": "1.12.0",
     "resolve-url-loader": "3.1.2",
     "sass-loader": "7.2.0",
+    "seafile-js": "0.2.182",
     "semver": "6.3.0",
     "style-loader": "^1.0.1",
     "terser-webpack-plugin": "4.2.3",
     "ts-pnp": "1.1.4",
+    "uglifyjs-webpack-plugin": "2.2.0",
     "url-loader": "2.1.0",
     "webpack": "4.41.0",
     "webpack-dev-server": "3.11.2",
     "webpack-manifest-plugin": "2.1.1",
+    "webpack-merge": "5.8.0",
     "workbox-webpack-plugin": "4.3.1"
   },
   "description": "This project was bootstrapped with [Create React App](https://github.com/facebookincubator/create-react-app).",

package/dist/_i18n/index.js

@@ -1,20 +0,0 @@
-import i18n from 'i18next';
-import Backend from 'i18next-xhr-backend';
-import LanguageDetector from 'i18next-browser-languagedetector';
-import { initReactI18next } from 'react-i18next';
-i18n.use(Backend).use(LanguageDetector).use(initReactI18next).init({
-  lng: 'zh-CN',
-  fallbackLng: 'en',
-  ns: ['seafile-editor'],
-  defaultNS: 'seafile-editor',
-  debug: false,
-  // console log if debug: true
-  interpolation: {
-    escapeValue: false // not needed for react!!
-
-  },
-  react: {
-    wait: true
-  }
-});
-export default i18n;

package/dist/assets/css/index.css

@@ -1,97 +0,0 @@
-* {
-  margin: 0;
-  padding: 0;
-}
-html,
-input,
-textarea {
-  font-family: 'Roboto', sans-serif;
-  line-height: 1.4;
-  background: #eee;
-}
-
-body {
-  overflow-y: hidden;
-}
-
-p {
-  margin: 0;
-}
-
-:not(pre) > code {
-  font-family: monospace;
-  background-color: #eee;
-  padding: 3px;
-}
-
-img {
-  max-width: 100%;
-}
-
-img.active {
-  box-shadow: 0 0 0 2px blue;
-}
-
-input {
-  box-sizing: border-box;
-  font-size: 0.85em;
-  width: 100%;
-  padding: 0.5em;
-  border: 2px solid #ddd;
-  background: #fafafa;
-}
-
-input:focus {
-  outline: 0;
-  border-color: blue;
-}
-input[type="checkbox"] {
-  width: auto;
-}
-
-
-.lds-ripple {
-  display: inline-block;
-  position: relative;
-  width: 64px;
-  height: 64px;
-}
-.lds-ripple div {
-  position: absolute;
-  border: 4px solid #eb8205;
-  opacity: 1;
-  border-radius: 50%;
-  animation: lds-ripple 1s cubic-bezier(0, 0.2, 0.8, 1) infinite;
-}
-.lds-ripple div:nth-child(2) {
-  animation-delay: -0.5s;
-}
-@keyframes lds-ripple {
-  0% {
-    top: 28px;
-    left: 28px;
-    width: 0;
-    height: 0;
-    opacity: 1;
-  }
-  100% {
-    top: -1px;
-    left: -1px;
-    width: 58px;
-    height: 58px;
-    opacity: 0;
-  }
-}
-.empty-loading-page {
-  position: fixed;
-  height: 100%;
-  width: 100%;
-}
-
-.page-centered {
-  position: fixed;
-  top: 50%;
-  left: 50%;
-  /* bring your own prefixes */
-  transform: translate(-50%, -50%);
-}