@seafile/sdoc-editor 3.0.92 → 3.0.93

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -17,7 +17,7 @@
17
17
 
18
18
  .sdoc-file-view-container .sdoc-file-view-content {
19
19
  position: relative;
20
- border: 2px solid #eee;
20
+ border: 2px solid transparent;
21
21
  border-radius: 4px;
22
22
  resize: vertical;
23
23
  }
@@ -35,6 +35,10 @@
35
35
  height: 396px;
36
36
  }
37
37
 
38
+ .sdoc-file-view-container .sdoc-file-view-content .sea-metadata .sea-metadata-table-main-container {
39
+ border: 1px solid #eee;
40
+ }
41
+
38
42
  .sdoc-file-view-container .sdoc-file-view-content .file-view-resizer {
39
43
  width: 10px;
40
44
  height: 10px;
@@ -44,9 +44,9 @@ var AddLinkDialog = function AddLinkDialog(_ref) {
44
44
  var _ref2 = element || {
45
45
  href: ''
46
46
  },
47
- oldURL = _ref2.href,
48
47
  linked_id = _ref2.linked_id,
49
48
  linked_wiki_page_id = _ref2.linked_wiki_page_id;
49
+ var oldURL = (0, _helpers.getElementHref)(element);
50
50
  var oldTitle = (element === null || element === void 0 ? void 0 : element.children[0].text) || linkTitle || '';
51
51
  var initTitle = (0, _react.useMemo)(function () {
52
52
  return oldTitle ? oldTitle : (0, _core.getEditorString)(editor, editor.selection);
@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
4
4
  Object.defineProperty(exports, "__esModule", {
5
5
  value: true
6
6
  });
7
- exports.upsertLinkText = exports.updateLink = exports.unWrapLinkNode = exports.parseHtmlString = exports.isWeChat = exports.isSdocFile = exports.isNodeInCurrentView = exports.isMenuDisabled = exports.isLinkToolBarActive = exports.isExdrawFile = exports.isEmptyNode = exports.isCommonFile = exports.insertLink = exports.getMenuPosition = exports.getLinkType = exports.genLinkNode = exports.checkLink = void 0;
7
+ exports.upsertLinkText = exports.updateLink = exports.unWrapLinkNode = exports.parseHtmlString = exports.isWeChat = exports.isSdocFile = exports.isNodeInCurrentView = exports.isMenuDisabled = exports.isLinkToolBarActive = exports.isExdrawFile = exports.isEmptyNode = exports.isCommonFile = exports.insertLink = exports.getMenuPosition = exports.getLinkType = exports.getElementHref = exports.genLinkNode = exports.checkLink = void 0;
8
8
  var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
9
9
  var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
10
10
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
@@ -321,4 +321,7 @@ var isEmptyNode = exports.isEmptyNode = function isEmptyNode(node) {
321
321
  if (node.type === _constants2.IMAGE_BLOCK) return false;
322
322
  var text = _slate.Node.string(node);
323
323
  return text.trim() === '';
324
+ };
325
+ var getElementHref = exports.getElementHref = function getElementHref(element) {
326
+ return element.href || element.url;
324
327
  };
@@ -37,19 +37,20 @@ var LinkHover = function LinkHover(_ref) {
37
37
  setIsShowTooltip(true);
38
38
  }, []);
39
39
  var onMouseDown = (0, _react.useCallback)(function (event) {
40
- if (!(0, _isUrl["default"])(element.href)) {
40
+ var href = (0, _helpers.getElementHref)(element);
41
+ if (!(0, _isUrl["default"])(href)) {
41
42
  event.preventDefault();
42
43
  _toast["default"].danger(t('The_link_is_invalid'));
43
44
  return;
44
45
  }
45
46
  event.stopPropagation();
46
47
  if (!(0, _helpers.isWeChat)()) {
47
- window.open(element.href);
48
+ window.open(href);
48
49
  } else {
49
50
  // eslint-disable-next-line no-restricted-globals
50
- location.href = element.href;
51
+ location.href = href;
51
52
  }
52
- }, [element.href]);
53
+ }, [element, t]);
53
54
  var handleOnClick = (0, _react.useCallback)(function (event) {
54
55
  event.stopPropagation();
55
56
  if (!linked_id && !linked_wiki_page_id) return;
@@ -1,5 +1,6 @@
1
1
  "use strict";
2
2
 
3
+ var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard")["default"];
3
4
  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
4
5
  Object.defineProperty(exports, "__esModule", {
5
6
  value: true
@@ -16,6 +17,7 @@ var _reactI18next = require("react-i18next");
16
17
  var _slate = require("@seafile/slate");
17
18
  var _classnames = _interopRequireDefault(require("classnames"));
18
19
  var _isUrl = _interopRequireDefault(require("is-url"));
20
+ var _propTypes = _interopRequireWildcard(require("prop-types"));
19
21
  var _toast = _interopRequireDefault(require("../../../components/toast"));
20
22
  var _constants = require("../../../constants");
21
23
  var _useScrollContext = require("../../../hooks/use-scroll-context");
@@ -37,6 +39,7 @@ var Link = /*#__PURE__*/function (_React$Component) {
37
39
  if (scrollRef.current) {
38
40
  scrollRef.current.addEventListener('scroll', _this.onScroll);
39
41
  _this.resizeObserver = new ResizeObserver(function (entries) {
42
+ // eslint-disable-next-line no-unused-vars
40
43
  var _iterator = (0, _createForOfIteratorHelper2["default"])(entries),
41
44
  _step;
42
45
  try {
@@ -85,8 +88,8 @@ var Link = /*#__PURE__*/function (_React$Component) {
85
88
  var isModClick = (0, _commonUtils.isMac)() ? e.metaKey : e.ctrlKey;
86
89
  var _this$props$element = _this.props.element,
87
90
  linked_id = _this$props$element.linked_id,
88
- linked_wiki_page_id = _this$props$element.linked_wiki_page_id,
89
- href = _this$props$element.href;
91
+ linked_wiki_page_id = _this$props$element.linked_wiki_page_id;
92
+ var href = (0, _helpers.getElementHref)(_propTypes.element);
90
93
  // mod + click
91
94
  if (isModClick && !linked_id && !linked_wiki_page_id) {
92
95
  window.open(href, '_blank', 'noreferrer');
@@ -119,15 +122,16 @@ var Link = /*#__PURE__*/function (_React$Component) {
119
122
  var _this$props = _this.props,
120
123
  element = _this$props.element,
121
124
  t = _this$props.t;
122
- if (!(0, _isUrl["default"])(element.href)) {
125
+ var href = (0, _helpers.getElementHref)(element);
126
+ if (!(0, _isUrl["default"])(href)) {
123
127
  _toast["default"].danger(t('The_link_is_invalid'));
124
128
  return;
125
129
  }
126
130
  if (!(0, _helpers.isWeChat)()) {
127
- window.open(element.href, '_blank', 'noopener,noreferrer');
131
+ window.open(href, '_blank', 'noopener,noreferrer');
128
132
  } else {
129
133
  // eslint-disable-next-line no-restricted-globals
130
- location.href = element.href;
134
+ location.href = href;
131
135
  }
132
136
  });
133
137
  (0, _defineProperty2["default"])(_this, "openDialog", function () {
@@ -172,7 +176,7 @@ var Link = /*#__PURE__*/function (_React$Component) {
172
176
  return /*#__PURE__*/_react["default"].createElement("span", Object.assign({
173
177
  className: (0, _classnames["default"])(className, 'virtual-link')
174
178
  }, attributes), /*#__PURE__*/_react["default"].createElement("a", {
175
- href: element.href,
179
+ href: (0, _helpers.getElementHref)(element),
176
180
  title: (_element$children$ = element.children[0]) === null || _element$children$ === void 0 ? void 0 : _element$children$.text,
177
181
  onClick: this.onOpenLink,
178
182
  target: "_blank",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@seafile/sdoc-editor",
3
- "version": "3.0.92",
3
+ "version": "3.0.93",
4
4
  "main": "dist/index.js",
5
5
  "scripts": {
6
6
  "test": "jest",
@@ -72,5 +72,5 @@
72
72
  "publishConfig": {
73
73
  "access": "public"
74
74
  },
75
- "gitHead": "c9b472a90c10e25767d332fc2fd1d5a46d8213b9"
75
+ "gitHead": "8364deb5e3eb9a8bd775faf8730d928e535910a0"
76
76
  }