coop-cloud-chaos-patchs/outline
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes link editing

Browse Source
This commit is contained in:
Tom Moor
2017-10-23 20:13:22 -07:00
parent 6ef886ad2a
commit e79897e5cb
4 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
frontend/components/Editor/Editor.js
View File

@ -3,7 +3,7 @@ import React, { Component } from 'react';
import { observer } from 'mobx-react'; import { observer } from 'mobx-react';
import { Editor, Plain } from 'slate'; import { Editor, Plain } from 'slate';
import keydown from 'react-keydown'; import keydown from 'react-keydown';
import type { Document, State, Editor as EditorType } from './types'; import type { State, Editor as EditorType } from './types';
import getDataTransferFiles from 'utils/getDataTransferFiles'; import getDataTransferFiles from 'utils/getDataTransferFiles';
import Flex from 'components/Flex'; import Flex from 'components/Flex';
import ClickablePadding from './components/ClickablePadding'; import ClickablePadding from './components/ClickablePadding';
@ -76,10 +76,10 @@ type KeyData = {
onChange = (state: State) => { onChange = (state: State) => {
this.setState({ state }); this.setState({ state });
};
onDocumentChange = (document: Document, state: State) => { if (this.state.state !== state) {
this.props.onChange(Markdown.serialize(state)); this.props.onChange(Markdown.serialize(state));
}
}; };
handleDrop = async (ev: SyntheticEvent) => { handleDrop = async (ev: SyntheticEvent) => {
@ -205,7 +205,6 @@ type KeyData = {
state={this.state.state} state={this.state.state}
onKeyDown={this.onKeyDown} onKeyDown={this.onKeyDown}
onChange={this.onChange} onChange={this.onChange}
onDocumentChange={this.onDocumentChange}
onSave={onSave} onSave={onSave}
readOnly={readOnly} readOnly={readOnly}
/> />

4
frontend/components/Editor/components/Toolbar/components/DocumentResult.js
View File

@ -3,7 +3,7 @@ import React from 'react';
import styled from 'styled-components'; import styled from 'styled-components';
import { fontWeight, color } from 'styles/constants'; import { fontWeight, color } from 'styles/constants';
import Document from 'models/Document'; import Document from 'models/Document';
import GoToIcon from 'components/Icon/GoToIcon'; import NextIcon from 'components/Icon/NextIcon';
type Props = { type Props = {
innerRef?: Function, innerRef?: Function,
@ -14,7 +14,7 @@ type Props = {
function DocumentResult({ document, ...rest }: Props) { function DocumentResult({ document, ...rest }: Props) {
return ( return (
<ListItem {...rest} href=""> <ListItem {...rest} href="">
<i><GoToIcon light /></i> <i><NextIcon light /></i>
{document.title} {document.title}
</ListItem> </ListItem>
); );

7
frontend/components/Editor/components/Toolbar/components/LinkToolbar.js
View File

@ -114,9 +114,10 @@ class LinkToolbar extends Component {
const { state } = this.props; const { state } = this.props;
const transform = state.transform(); const transform = state.transform();
if (state.selection.isExpanded) { if (href) {
transform.setInline({ type: 'link', data: { href } });
} else {
transform.unwrapInline('link'); transform.unwrapInline('link');
if (href) transform.wrapInline({ type: 'link', data: { href } });
} }
this.props.onChange(transform.apply()); this.props.onChange(transform.apply());
@ -179,7 +180,7 @@ class LinkToolbar extends Component {
} }
const SearchResults = styled.div` const SearchResults = styled.div`
background: rgba(34, 34, 34, .95); background: #2F3336;
position: absolute; position: absolute;
top: 100%; top: 100%;
width: 100%; width: 100%;

15
frontend/components/Icon/NextIcon.js Normal file
View File

@ -0,0 +1,15 @@
// @flow
import React from 'react';
import Icon from './Icon';
import type { Props } from './Icon';
export default function NextIcon(props: Props) {
return (
<Icon {...props}>
<path
d="M9.29289322,16.2928932 C8.90236893,16.6834175 8.90236893,17.3165825 9.29289322,17.7071068 C9.68341751,18.0976311 10.3165825,18.0976311 10.7071068,17.7071068 L15.7071068,12.7071068 C16.0976311,12.3165825 16.0976311,11.6834175 15.7071068,11.2928932 L10.7071068,6.29289322 C10.3165825,5.90236893 9.68341751,5.90236893 9.29289322,6.29289322 C8.90236893,6.68341751 8.90236893,7.31658249 9.29289322,7.70710678 L13.5857864,12 L9.29289322,16.2928932 Z"
id="path-1"
/>
</Icon>
);
}