public/Boostnote
1
0
Fork 0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-13 09:46:22 +00:00
Code Issues Releases Wiki Activity

Revert flickering fix

Browse Source
This commit is contained in:
Junyoung Choi
2018-09-01 16:50:52 +09:00
parent 039f73711a
commit d015b18c66
3 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
browser/components/CodeEditor.js
View File

@@ -24,7 +24,6 @@ export default class CodeEditor extends React.Component {
constructor (props) { constructor (props) {
super(props) super(props)
this.state = { isReady: false }
this.scrollHandler = _.debounce(this.handleScroll.bind(this), 100, { this.scrollHandler = _.debounce(this.handleScroll.bind(this), 100, {
leading: false, leading: false,
trailing: true trailing: true
@@ -215,7 +214,7 @@ export default class CodeEditor extends React.Component {
CodeMirror.Vim.defineEx('wq', 'wq', this.quitEditor) CodeMirror.Vim.defineEx('wq', 'wq', this.quitEditor)
CodeMirror.Vim.defineEx('qw', 'qw', this.quitEditor) CodeMirror.Vim.defineEx('qw', 'qw', this.quitEditor)
CodeMirror.Vim.map('ZZ', ':q', 'normal') CodeMirror.Vim.map('ZZ', ':q', 'normal')
this.setState({ isReady: true })
this.tableEditor = new TableEditor(new TextEditorInterface(this.editor)) this.tableEditor = new TableEditor(new TextEditorInterface(this.editor))
eventEmitter.on('code:format-table', this.formatTable) eventEmitter.on('code:format-table', this.formatTable)
} }
@@ -582,8 +581,7 @@ export default class CodeEditor extends React.Component {
style={{ style={{
fontFamily, fontFamily,
fontSize: fontSize, fontSize: fontSize,
width: width, width: width
opacity: this.state.isReady ? '1' : '0'
}} }}
onDrop={e => this.handleDropImage(e)} onDrop={e => this.handleDropImage(e)}
/> />

3
browser/components/MarkdownEditor.js
View File

@@ -6,7 +6,6 @@ import CodeEditor from 'browser/components/CodeEditor'
import MarkdownPreview from 'browser/components/MarkdownPreview' import MarkdownPreview from 'browser/components/MarkdownPreview'
import eventEmitter from 'browser/main/lib/eventEmitter' import eventEmitter from 'browser/main/lib/eventEmitter'
import { findStorage } from 'browser/lib/findStorage' import { findStorage } from 'browser/lib/findStorage'
import debounceRender from 'react-debounce-render'
class MarkdownEditor extends React.Component { class MarkdownEditor extends React.Component {
constructor (props) { constructor (props) {
@@ -313,4 +312,4 @@ MarkdownEditor.propTypes = {
ignorePreviewPointerEvents: PropTypes.bool ignorePreviewPointerEvents: PropTypes.bool
} }
export default debounceRender(CSSModules(MarkdownEditor, styles)) export default CSSModules(MarkdownEditor, styles)

11
browser/components/MarkdownPreview.js
View File

@@ -180,9 +180,7 @@ const defaultCodeBlockFontFamily = [
export default class MarkdownPreview extends React.Component { export default class MarkdownPreview extends React.Component {
constructor (props) { constructor (props) {
super(props) super(props)
this.state = {
isReady: false
}
this.contextMenuHandler = e => this.handleContextMenu(e) this.contextMenuHandler = e => this.handleContextMenu(e)
this.mouseDownHandler = e => this.handleMouseDown(e) this.mouseDownHandler = e => this.handleMouseDown(e)
this.mouseUpHandler = e => this.handleMouseUp(e) this.mouseUpHandler = e => this.handleMouseUp(e)
@@ -457,7 +455,6 @@ export default class MarkdownPreview extends React.Component {
eventEmitter.on('export:save-md', this.saveAsMdHandler) eventEmitter.on('export:save-md', this.saveAsMdHandler)
eventEmitter.on('export:save-html', this.saveAsHtmlHandler) eventEmitter.on('export:save-html', this.saveAsHtmlHandler)
eventEmitter.on('print', this.printHandler) eventEmitter.on('print', this.printHandler)
setTimeout(() => this.setState({ isReady: true }))
} }
componentWillUnmount () { componentWillUnmount () {
@@ -850,11 +847,7 @@ export default class MarkdownPreview extends React.Component {
className={ className={
className != null ? 'MarkdownPreview ' + className : 'MarkdownPreview' className != null ? 'MarkdownPreview ' + className : 'MarkdownPreview'
} }
style={ style={style}
this.state.isReady
? Object.assign(style, { opacity: '1' })
: Object.assign(style, { opacity: '0' })
}
tabIndex={tabIndex} tabIndex={tabIndex}
ref='root' ref='root'
/> />