From f72ab83ca46d8aac2ae0c3f6b10d295eeab363b2 Mon Sep 17 00:00:00 2001 From: xmcp Date: Fri, 24 May 2019 19:03:47 +0800 Subject: [PATCH] fix ios pressure helper and click handler --- src/App.js | 13 +++++++------ src/Flows.js | 11 +++++++++++ src/PressureHelper.css | 4 ---- src/PressureHelper.js | 2 -- src/Sidebar.js | 2 +- src/react-lazyload | 2 +- 6 files changed, 20 insertions(+), 14 deletions(-) diff --git a/src/App.js b/src/App.js index 5167e231..69ac7a88 100644 --- a/src/App.js +++ b/src/App.js @@ -17,7 +17,7 @@ class App extends Component { super(props); load_config(); this.state={ - sidebar_title: '', + sidebar_title: null, sidebar_content: null, // determine status of sidebar mode: 'list', // list, single, search, attention search_text: null, @@ -33,11 +33,11 @@ class App extends Component { } on_pressure() { - if(this.state.sidebar_content) - this.setState({ - sidebar_title: '', - sidebar_content: null, - }); + if(this.state.sidebar_title!==null) + this.setState((prevState)=>({ + sidebar_title: null, + sidebar_content: prevState.sidebar_content, + })); else this.set_mode('list',null); } @@ -97,6 +97,7 @@ class App extends Component { )} { this.setState({ + sidebar_title: null, sidebar_content: null, }); }} content={this.state.sidebar_content} title={this.state.sidebar_title} /> diff --git a/src/Flows.js b/src/Flows.js index 94496450..3203cf10 100644 --- a/src/Flows.js +++ b/src/Flows.js @@ -173,6 +173,17 @@ class FlowSidebar extends PureComponent { this.reply_ref=React.createRef(); } + componentWillReceiveProps(nextProps) { + this.setState({ + attention: nextProps.attention, + info: nextProps.info, + replies: nextProps.replies, + loading_status: 'done', + }); + this.color_picker=nextProps.color_picker; + this.syncState=nextProps.sync_state||(()=>{}); + } + set_variant(cid,variant) { this.setState((prev)=>{ if(cid) diff --git a/src/PressureHelper.css b/src/PressureHelper.css index 3effa1f9..fa66f32c 100644 --- a/src/PressureHelper.css +++ b/src/PressureHelper.css @@ -10,10 +10,6 @@ visibility: hidden; } -.pressure-no-select * { - user-select: none !important; -} - .pressure-box-fired { border-color: orangered; pointer-events: initial !important; diff --git a/src/PressureHelper.js b/src/PressureHelper.js index a1a2090b..278562f2 100644 --- a/src/PressureHelper.js +++ b/src/PressureHelper.js @@ -42,7 +42,6 @@ export class PressureHelper extends Component { change: (force)=>{ if(!this.state.fired) { if(force>=.999) { - document.body.classList.add('pressure-no-select'); this.do_fire(); } else @@ -56,7 +55,6 @@ export class PressureHelper extends Component { level: 0, fired: false, }); - document.body.classList.remove('pressure-no-select'); }, }, { polyfill: false, diff --git a/src/Sidebar.js b/src/Sidebar.js index 0f329599..e5beeb98 100644 --- a/src/Sidebar.js +++ b/src/Sidebar.js @@ -3,7 +3,7 @@ import './Sidebar.css'; export function Sidebar(props) { return ( -
+
{props.content} diff --git a/src/react-lazyload b/src/react-lazyload index b985b694..1b0c9e25 160000 --- a/src/react-lazyload +++ b/src/react-lazyload @@ -1 +1 @@ -Subproject commit b985b694eebf8970fe37d334091d1bb8a7c5f553 +Subproject commit 1b0c9e258df0897f37f8ef263bb4ca2719d50442