refactor(Proxies): UI revamp

This commit is contained in:
Haishan 2020-02-10 22:53:14 +08:00
parent bd82b8c5e3
commit e85116bf71
20 changed files with 571 additions and 281 deletions

View file

@ -55,6 +55,7 @@
"react-router-dom": "^6.0.0-alpha.1", "react-router-dom": "^6.0.0-alpha.1",
"react-table": "7.0.0-rc.15", "react-table": "7.0.0-rc.15",
"react-tabs": "^3.1.0", "react-tabs": "^3.1.0",
"react-tiny-fab": "^3.4.0",
"react-window": "^1.8.5", "react-window": "^1.8.5",
"redux": "^4.0.5", "redux": "^4.0.5",
"redux-logger": "^3.0.6", "redux-logger": "^3.0.6",

3
prettier.config.js Normal file
View file

@ -0,0 +1,3 @@
module.exports = {
singleQuote: true
};

View file

@ -0,0 +1,79 @@
import React from 'react';
import ResizeObserver from 'resize-observer-polyfill';
import { motion } from 'framer-motion';
const { memo, useState, useRef, useEffect } = React;
function usePrevious(value) {
const ref = useRef();
useEffect(() => void (ref.current = value), [value]);
return ref.current;
}
function useMeasure() {
const ref = useRef();
const [bounds, set] = useState({ height: 0 });
useEffect(() => {
const ro = new ResizeObserver(([entry]) => set(entry.contentRect));
if (ref.current) ro.observe(ref.current);
return () => ro.disconnect();
}, []);
return [ref, bounds];
}
const variantsCollpapsibleWrap = {
initialOpen: {
height: 'auto',
transition: { duration: 0 }
},
open: height => ({
height,
opacity: 1,
visibility: 'visible',
transition: { duration: 0.3 }
}),
closed: {
height: 0,
opacity: 0,
visibility: 'hidden',
transition: { duration: 0.3 }
}
};
const variantsCollpapsibleChildContainer = {
open: {
x: 0
},
closed: {
x: 20
}
};
const Collapsible = memo(({ children, isOpen }) => {
const previous = usePrevious(isOpen);
const [refToMeature, { height }] = useMeasure();
return (
<div>
<motion.div
animate={
isOpen && previous === isOpen
? 'initialOpen'
: isOpen
? 'open'
: 'closed'
}
custom={height}
variants={variantsCollpapsibleWrap}
>
<motion.div
variants={variantsCollpapsibleChildContainer}
ref={refToMeature}
>
{children}
</motion.div>
</motion.div>
</div>
);
});
export default Collapsible;

View file

@ -0,0 +1,34 @@
import React from 'react';
import { ChevronDown } from 'react-feather';
import cx from 'classnames';
import { SectionNameType } from './shared/Basic';
import Button from './Button';
import s from './CollapsibleSectionHeader.module.css';
type Props = {
name: string,
type: string,
qty?: number,
toggle?: () => void,
isOpen?: boolean
};
export default function Header({ name, type, toggle, isOpen, qty }: Props) {
return (
<div className={s.header}>
<div onClick={toggle} style={{ cursor: 'pointer' }}>
<SectionNameType name={name} type={type} />
</div>
{typeof qty === 'number' ? <span className={s.qty}>{qty}</span> : null}
<Button kind="minimal" onClick={toggle}>
<span className={cx(s.arrow, { [s.isOpen]: isOpen })}>
<ChevronDown size={20} />
</span>
</Button>
</div>
);
}

View file

@ -0,0 +1,30 @@
.header {
display: flex;
align-items: center;
.arrow {
display: inline-flex;
transform: rotate(0deg);
transition: transform 0.3s;
&.isOpen {
transform: rotate(180deg);
}
&:focus {
outline: var(--color-focus-blue) solid 1px;
}
}
}
/* TODO duplicate with connQty in Connections.module.css */
.qty {
font-family: var(--font-normal);
font-size: 0.75em;
margin-left: 3px;
padding: 2px 7px;
display: inline-flex;
justify-content: center;
align-items: center;
background-color: var(--bg-near-transparent);
border-radius: 30px;
}

View file

@ -1,19 +1,18 @@
import React from 'react'; import React from 'react';
// import { useStoreState } from '../misc/store';
import { connect } from './StateProvider'; import { connect, useStoreActions } from './StateProvider';
import ContentHeader from './ContentHeader'; import ContentHeader from './ContentHeader';
import ProxyGroup from './ProxyGroup'; import ProxyGroup from './ProxyGroup';
import Button from './Button'; import { Zap, Filter, Circle } from 'react-feather';
import { Zap, Filter } from 'react-feather';
import ProxyProviderList from './ProxyProviderList'; import ProxyProviderList from './ProxyProviderList';
import { Fab, Action } from 'react-tiny-fab';
import './rtf.css';
import s0 from './Proxies.module.css'; import s0 from './Proxies.module.css';
import { import {
getProxies,
getDelay, getDelay,
getRtFilterSwitch, getRtFilterSwitch,
getProxyGroupNames, getProxyGroupNames,
@ -23,29 +22,18 @@ import {
} from '../store/proxies'; } from '../store/proxies';
import { getClashAPIConfig } from '../store/app'; import { getClashAPIConfig } from '../store/app';
const { useEffect, useMemo, useCallback, useRef } = React; const { useEffect, useCallback, useRef } = React;
function Proxies({ function Proxies({
dispatch, dispatch,
groupNames, groupNames,
proxies,
delay, delay,
proxyProviders, proxyProviders,
apiConfig, apiConfig,
filterZeroRT filterZeroRT
}) { }) {
const refFetchedTimestamp = useRef({}); const refFetchedTimestamp = useRef({});
const { toggleUnavailableProxiesFilter } = useStoreActions();
const switchRequetState = (dispath, getState) => {
const preState = getRtFilterSwitch(getState());
dispatch('store/proxies#filterZeroRTProxies', s => {
s.filterZeroRT = !preState;
});
};
const filterZeroRTFn = useCallback(() => dispatch(switchRequetState), [
dispatch
]);
const requestDelayAllFn = useCallback( const requestDelayAllFn = useCallback(
() => dispatch(requestDelayAll(apiConfig)), () => dispatch(requestDelayAll(apiConfig)),
[apiConfig, dispatch] [apiConfig, dispatch]
@ -73,29 +61,16 @@ function Proxies({
window.addEventListener('focus', fn, false); window.addEventListener('focus', fn, false);
return () => window.removeEventListener('focus', fn, false); return () => window.removeEventListener('focus', fn, false);
}, [fetchProxiesHooked]); }, [fetchProxiesHooked]);
const icon = useMemo(() => <Zap width={16} />, []);
const filterIcon = useMemo(() => <Filter width={16} />, []);
return ( return (
<> <>
<ContentHeader title="Proxies" /> <ContentHeader title="Proxies" />
<div> <div>
<div className="fabgrp">
<Button
text="Test Latency"
start={icon}
onClick={requestDelayAllFn}
/>
<Button start={filterIcon} onClick={filterZeroRTFn}>
<span>{filterZeroRT ? 'show' : 'hide'} 0ms proxies</span>
</Button>
</div>
{groupNames.map(groupName => { {groupNames.map(groupName => {
return ( return (
<div className={s0.group} key={groupName}> <div className={s0.group} key={groupName}>
<ProxyGroup <ProxyGroup
name={groupName} name={groupName}
proxies={proxies}
delay={delay} delay={delay}
apiConfig={apiConfig} apiConfig={apiConfig}
dispatch={dispatch} dispatch={dispatch}
@ -106,6 +81,17 @@ function Proxies({
</div> </div>
<ProxyProviderList items={proxyProviders} /> <ProxyProviderList items={proxyProviders} />
<div style={{ height: 60 }} /> <div style={{ height: 60 }} />
<Fab icon={<Circle />}>
<Action text="Test Latency" onClick={requestDelayAllFn}>
<Zap width={16} />
</Action>
<Action
text={(filterZeroRT ? 'Show' : 'Hide') + ' Unavailable Proxies'}
onClick={toggleUnavailableProxiesFilter}
>
<Filter width={16} />
</Action>
</Fab>
</> </>
); );
} }
@ -113,7 +99,6 @@ function Proxies({
const mapState = s => ({ const mapState = s => ({
apiConfig: getClashAPIConfig(s), apiConfig: getClashAPIConfig(s),
groupNames: getProxyGroupNames(s), groupNames: getProxyGroupNames(s),
proxies: getProxies(s),
proxyProviders: getProxyProviders(s), proxyProviders: getProxyProviders(s),
delay: getDelay(s), delay: getDelay(s),
filterZeroRT: getRtFilterSwitch(s) filterZeroRT: getRtFilterSwitch(s)

View file

@ -1,4 +1,3 @@
// vim: set ft=javascript.flow :
import React from 'react'; import React from 'react';
import cx from 'classnames'; import cx from 'classnames';
@ -84,15 +83,15 @@ function Proxy({ now, name, proxy, latency }: ProxyProps) {
})} })}
> >
<div className={s0.proxyName}>{name}</div> <div className={s0.proxyName}>{name}</div>
<div className={s0.row}>
<span className={s0.proxyType} style={{ opacity: now ? 0.6 : 0.2 }}> <span className={s0.proxyType} style={{ opacity: now ? 0.6 : 0.2 }}>
{proxy.type} {proxy.type}
</span> </span>
{latency && latency.number ? ( {latency && latency.number ? (
<span className={s0.proxyLatencyWrap}>
<ProxyLatency number={latency.number} color={color} /> <ProxyLatency number={latency.number} color={color} />
</span>
) : null} ) : null}
</div> </div>
</div>
); );
} }

View file

@ -6,7 +6,7 @@
max-width: 280px; max-width: 280px;
@media (--breakpoint-not-small) { @media (--breakpoint-not-small) {
min-width: 150px; min-width: 200px;
border-radius: 10px; border-radius: 10px;
padding: 10px; padding: 10px;
} }
@ -23,33 +23,29 @@
.proxyType { .proxyType {
font-family: var(--font-mono); font-family: var(--font-mono);
display: inline;
padding: 0 0.3em;
font-size: 0.6em; font-size: 0.6em;
@media (--breakpoint-not-small) { @media (--breakpoint-not-small) {
font-size: 1em; font-size: 1em;
} }
} }
.row {
display: flex;
align-items: center;
justify-content: space-between;
}
.proxyName { .proxyName {
width: 100%; width: 100%;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
margin-bottom: 5px; margin-bottom: 5px;
font-size: 0.85em; font-size: 0.85em;
display: inline;
@media (--breakpoint-not-small) { @media (--breakpoint-not-small) {
font-size: 1.1em; font-size: 1.1em;
} }
} }
.proxyLatencyWrap {
padding: 0 0.3em;
height: 30px;
/* display: flex; */
align-items: flex-end;
}
.proxySmall { .proxySmall {
.now { .now {
outline: pink solid 1px; outline: pink solid 1px;

View file

@ -1,73 +1,49 @@
import React from 'react'; import React from 'react';
import Button from './Button';
import { ChevronsDown } from 'react-feather';
import cx from 'classnames'; import cx from 'classnames';
import { connect } from './StateProvider'; import memoizeOne from 'memoize-one';
import { getDelay, getRtFilterSwitch } from '../store/proxies';
import { connect } from './StateProvider';
import { getProxies, getRtFilterSwitch } from '../store/proxies';
import CollapsibleSectionHeader from './CollapsibleSectionHeader';
import Proxy, { ProxySmall } from './Proxy'; import Proxy, { ProxySmall } from './Proxy';
import { SectionNameType } from './shared/Basic'; import { useToggle } from '../hooks/basic';
import s0 from './ProxyGroup.module.css'; import s0 from './ProxyGroup.module.css';
import { switchProxy } from '../store/proxies'; import { switchProxy } from '../store/proxies';
const { memo, useCallback, useMemo, useState } = React; const { useCallback, useMemo } = React;
function ProxyGroup({ name, proxies, apiConfig, dispatch }) {
const group = proxies[name];
const { all, type, now } = group;
function ProxyGroup({ name, all, type, now, apiConfig, dispatch }) {
const isSelectable = useMemo(() => type === 'Selector', [type]); const isSelectable = useMemo(() => type === 'Selector', [type]);
const [isOpen, toggle] = useToggle(true);
const [isShow, setIsShow] = useState({
show: false
});
const updateShow = useCallback(
type => {
setIsShow({
show: !isShow.show
});
},
[isShow]
);
const itemOnTapCallback = useCallback( const itemOnTapCallback = useCallback(
proxyName => { proxyName => {
if (!isSelectable) return; if (!isSelectable) return;
dispatch(switchProxy(apiConfig, name, proxyName)); dispatch(switchProxy(apiConfig, name, proxyName));
// switchProxyFn(name, proxyName);
}, },
[apiConfig, dispatch, name, isSelectable] [apiConfig, dispatch, name, isSelectable]
); );
const button = useMemo(
() => (
<Button
className="btn"
start={<ChevronsDown width={16} />}
onClick={() => updateShow()}
// text={isShow.show ? 'hide' : 'show'}
/>
),
[updateShow]
);
return ( return (
<div className={s0.group}> <div className={s0.group}>
<div className={s0.header}> <CollapsibleSectionHeader
<SectionNameType name={name} type={group.type} dropDown={button} /> name={name}
</div> type={type}
toggle={toggle}
qty={all.length}
isOpen={isOpen}
/>
{isOpen ? (
<ProxyList <ProxyList
all={isShow.show ? all : []} all={all}
now={now} now={now}
isSelectable={isSelectable} isSelectable={isSelectable}
itemOnTapCallback={itemOnTapCallback} itemOnTapCallback={itemOnTapCallback}
/> />
) : (
<ProxyListSummaryView all={all} />
)}
</div> </div>
); );
} }
@ -79,7 +55,7 @@ type ProxyListProps = {
itemOnTapCallback?: string => void, itemOnTapCallback?: string => void,
show?: boolean show?: boolean
}; };
function ProxyListImpl({ export function ProxyList({
all, all,
now, now,
isSelectable, isSelectable,
@ -122,47 +98,36 @@ const getSortDelay = (d, w) => {
return w; return w;
}; };
const mapState = (s, { all }) => { function filterAvailableProxies(list, delay) {
const delay = getDelay(s); return list.filter(name => {
const filterByRt = getRtFilterSwitch(s);
const groupList = [];
const proxyList = [];
let clonelist = [...all];
if (filterByRt) {
const filterList = clonelist.filter(name => {
const d = delay[name]; const d = delay[name];
if (d === undefined) { if (d === undefined) {
groupList.push(name);
return true; return true;
} }
if (d.error || d.number === 0) { if (d.error || d.number === 0) {
return false; return false;
} else { } else {
proxyList.push(name);
return true; return true;
} }
}); });
//
if (proxyList.length > 0) {
//not test connection yet ,,show all
clonelist = filterList;
}
} }
return { function filterAvailableProxiesAndSortImpl(all, delay, filterByRt) {
all: clonelist.sort((first, second) => { // all is freezed
let filtered = [...all];
if (filterByRt) {
filtered = filterAvailableProxies(all, delay);
}
return filtered.sort((first, second) => {
const d1 = getSortDelay(delay[first], 999999); const d1 = getSortDelay(delay[first], 999999);
const d2 = getSortDelay(delay[second], 999999); const d2 = getSortDelay(delay[second], 999999);
return d1 - d2; return d1 - d2;
}) });
}; }
}; export const filterAvailableProxiesAndSort = memoizeOne(
filterAvailableProxiesAndSortImpl
export const ProxyList = connect(mapState)(ProxyListImpl); );
export function ProxyListSummaryView({ export function ProxyListSummaryView({
all, all,
@ -193,4 +158,14 @@ export function ProxyListSummaryView({
); );
} }
export default memo(ProxyGroup); export default connect((s, { name, delay }) => {
const proxies = getProxies(s);
const filterByRt = getRtFilterSwitch(s);
const group = proxies[name];
const { all, type, now } = group;
return {
all: filterAvailableProxiesAndSort(all, delay, filterByRt),
type,
now
};
})(ProxyGroup);

View file

@ -1,6 +1,5 @@
.proxyLatency { .proxyLatency {
border-radius: 20px; border-radius: 20px;
padding: 3px 0;
color: #eee; color: #eee;
font-size: 0.6em; font-size: 0.6em;
@media (--breakpoint-not-small) { @media (--breakpoint-not-small) {

View file

@ -1,69 +1,75 @@
import React from 'react'; import React from 'react';
import { ChevronDown, RotateCw, Zap } from 'react-feather'; import { RotateCw, Zap } from 'react-feather';
import { formatDistance } from 'date-fns'; import { formatDistance } from 'date-fns';
import ResizeObserver from 'resize-observer-polyfill';
import { motion } from 'framer-motion'; import { motion } from 'framer-motion';
import cx from 'classnames';
import { connect } from './StateProvider'; import { connect } from './StateProvider';
import { SectionNameType } from './shared/Basic'; import Collapsible from './Collapsible';
import { ProxyList, ProxyListSummaryView } from './ProxyGroup'; import CollapsibleSectionHeader from './CollapsibleSectionHeader';
import {
ProxyList,
ProxyListSummaryView,
filterAvailableProxiesAndSort
} from './ProxyGroup';
import Button from './Button'; import Button from './Button';
import { getClashAPIConfig } from '../store/app'; import { getClashAPIConfig } from '../store/app';
import { import {
getDelay,
getRtFilterSwitch,
updateProviderByName, updateProviderByName,
healthcheckProviderByName healthcheckProviderByName
} from '../store/proxies'; } from '../store/proxies';
import s from './ProxyProvider.module.css'; import s from './ProxyProvider.module.css';
const { memo, useState, useRef, useEffect, useCallback } = React; const { useState, useCallback } = React;
type Props = { type Props = {
item: Array<{
name: string, name: string,
proxies: Array<string>, proxies: Array<string>,
type: 'Proxy' | 'Rule', type: 'Proxy' | 'Rule',
vehicleType: 'HTTP' | 'File' | 'Compatible', vehicleType: 'HTTP' | 'File' | 'Compatible',
updatedAt?: string updatedAt?: string,
}>,
proxies: {
[string]: any
},
dispatch: any => void dispatch: any => void
}; };
function ProxyProvider({ item, dispatch, apiConfig }: Props) { function ProxyProvider({
name,
proxies,
vehicleType,
updatedAt,
dispatch,
apiConfig
}: Props) {
const [isHealthcheckLoading, setIsHealthcheckLoading] = useState(false); const [isHealthcheckLoading, setIsHealthcheckLoading] = useState(false);
const updateProvider = useCallback( const updateProvider = useCallback(
() => dispatch(updateProviderByName(apiConfig, item.name)), () => dispatch(updateProviderByName(apiConfig, name)),
[apiConfig, dispatch, item.name] [apiConfig, dispatch, name]
); );
const healthcheckProvider = useCallback(async () => { const healthcheckProvider = useCallback(async () => {
setIsHealthcheckLoading(true); setIsHealthcheckLoading(true);
await dispatch(healthcheckProviderByName(apiConfig, item.name)); await dispatch(healthcheckProviderByName(apiConfig, name));
setIsHealthcheckLoading(false); setIsHealthcheckLoading(false);
}, [apiConfig, dispatch, item.name, setIsHealthcheckLoading]); }, [apiConfig, dispatch, name, setIsHealthcheckLoading]);
const [isCollapsibleOpen, setCollapsibleOpen] = useState(false); const [isCollapsibleOpen, setCollapsibleOpen] = useState(false);
const toggle = useCallback(() => setCollapsibleOpen(x => !x), []); const toggle = useCallback(() => setCollapsibleOpen(x => !x), []);
const timeAgo = formatDistance(new Date(item.updatedAt), new Date()); const timeAgo = formatDistance(new Date(updatedAt), new Date());
return ( return (
<div className={s.body}> <div className={s.body}>
<div className={s.header} onClick={toggle}> <CollapsibleSectionHeader
<SectionNameType name={item.name} type={item.vehicleType} /> name={name}
<Button kind="minimal"> toggle={toggle}
<span className={cx(s.arrow, { [s.isOpen]: isCollapsibleOpen })}> type={vehicleType}
<ChevronDown /> isOpen={isCollapsibleOpen}
</span> qty={proxies.length}
</Button> />
</div>
<div className={s.updatedAt}> <div className={s.updatedAt}>
<small>Updated {timeAgo} ago</small> <small>Updated {timeAgo} ago</small>
</div> </div>
<Collapsible2 isOpen={isCollapsibleOpen}> <Collapsible isOpen={isCollapsibleOpen}>
<ProxyList all={item.proxies} /> <ProxyList all={proxies} />
<div className={s.actionFooter}> <div className={s.actionFooter}>
<Button text="Update" start={<Refresh />} onClick={updateProvider} /> <Button text="Update" start={<Refresh />} onClick={updateProvider} />
<Button <Button
@ -73,10 +79,10 @@ function ProxyProvider({ item, dispatch, apiConfig }: Props) {
isLoading={isHealthcheckLoading} isLoading={isHealthcheckLoading}
/> />
</div> </div>
</Collapsible2> </Collapsible>
<Collapsible2 isOpen={!isCollapsibleOpen}> <Collapsible isOpen={!isCollapsibleOpen}>
<ProxyListSummaryView all={item.proxies} /> <ProxyListSummaryView all={proxies} />
</Collapsible2> </Collapsible>
</div> </div>
); );
} }
@ -106,78 +112,17 @@ function Refresh() {
); );
} }
function usePrevious(value) { const mapState = (s, { proxies }) => {
const ref = useRef(); const filterByRt = getRtFilterSwitch(s);
useEffect(() => void (ref.current = value), [value]); const delay = getDelay(s);
return ref.current; const apiConfig = getClashAPIConfig(s);
} return {
apiConfig,
function useMeasure() { proxies: filterAvailableProxiesAndSort(proxies, delay, filterByRt)
const ref = useRef();
const [bounds, set] = useState({ height: 0 });
useEffect(() => {
const ro = new ResizeObserver(([entry]) => set(entry.contentRect));
if (ref.current) ro.observe(ref.current);
return () => ro.disconnect();
}, []);
return [ref, bounds];
}
const variantsCollpapsibleWrap = {
initialOpen: {
height: 'auto',
transition: { duration: 0 }
},
open: height => ({
height,
opacity: 1,
visibility: 'visible',
transition: { duration: 0.3 }
}),
closed: {
height: 0,
opacity: 0,
visibility: 'hidden',
transition: { duration: 0.3 }
}
}; };
const variantsCollpapsibleChildContainer = {
open: {
x: 0
},
closed: {
x: 20
}
}; };
const Collapsible2 = memo(({ children, isOpen }) => { // const mapState = s => ({
const previous = usePrevious(isOpen); // apiConfig: getClashAPIConfig(s)
const [refToMeature, { height }] = useMeasure(); // });
return (
<div>
<motion.div
animate={
isOpen && previous === isOpen
? 'initialOpen'
: isOpen
? 'open'
: 'closed'
}
custom={height}
variants={variantsCollpapsibleWrap}
>
<motion.div
variants={variantsCollpapsibleChildContainer}
ref={refToMeature}
>
{children}
</motion.div>
</motion.div>
</div>
);
});
const mapState = s => ({
apiConfig: getClashAPIConfig(s)
});
export default connect(mapState)(ProxyProvider); export default connect(mapState)(ProxyProvider);

View file

@ -1,22 +1,3 @@
.header {
display: flex;
align-items: center;
cursor: pointer;
.arrow {
display: inline-flex;
transform: rotate(0deg);
transition: transform 0.3s;
&.isOpen {
transform: rotate(180deg);
}
&:focus {
outline: var(--color-focus-blue) solid 1px;
}
}
}
.updatedAt { .updatedAt {
margin-bottom: 12px; margin-bottom: 12px;
small { small {

View file

@ -11,7 +11,14 @@ function ProxyProviderList({ items }) {
<ContentHeader title="Proxy Provider" /> <ContentHeader title="Proxy Provider" />
<div> <div>
{items.map(item => ( {items.map(item => (
<ProxyProvider key={item.name} item={item} /> <ProxyProvider
key={item.name}
name={item.name}
proxies={item.proxies}
type={item.type}
vehicleType={item.vehicleType}
updatedAt={item.updatedAt}
/>
))} ))}
</div> </div>
</> </>

View file

@ -79,11 +79,7 @@ export function connect(mapStateToProps) {
const state = useContext(StateContext); const state = useContext(StateContext);
const dispatch = useContext(DispatchContext); const dispatch = useContext(DispatchContext);
const mapped = mapStateToProps(state, props); const mapped = mapStateToProps(state, props);
const nextProps = { const nextProps = { dispatch, ...props, ...mapped };
...props,
...mapped,
dispatch
};
return <MemoComponent {...nextProps} />; return <MemoComponent {...nextProps} />;
} }
return Connected; return Connected;

235
src/components/rtf.css Normal file
View file

@ -0,0 +1,235 @@
/*
* for react-tiny-fab
* based on react-tiny-fab/dist/styles.css
*/
.rtf {
box-sizing: border-box;
margin: 25px;
position: fixed;
white-space: nowrap;
z-index: 9998;
padding-left: 0;
list-style: none;
}
.rtf.open .rtf--mb > * {
transform-origin: center center;
transform: rotate(315deg);
transition: ease-in-out transform 0.2s;
}
.rtf.open .rtf--mb > ul {
list-style: none;
margin: 0;
padding: 0;
}
.rtf.open .rtf--ab__c:hover > span {
transition: ease-in-out opacity 0.2s;
opacity: 0.9;
}
.rtf.open .rtf--ab__c > span.always-show {
transition: ease-in-out opacity 0.2s;
opacity: 0.9;
}
.rtf.open .rtf--ab__c:nth-child(1) {
transform: translateY(-60px) scale(1);
transition-delay: 0.03s;
}
.rtf.open .rtf--ab__c:nth-child(1).top {
transform: translateY(60px) scale(1);
}
.rtf.open .rtf--ab__c:nth-child(2) {
transform: translateY(-120px) scale(1);
transition-delay: 0.09s;
}
.rtf.open .rtf--ab__c:nth-child(2).top {
transform: translateY(120px) scale(1);
}
.rtf.open .rtf--ab__c:nth-child(3) {
transform: translateY(-180px) scale(1);
transition-delay: 0.12s;
}
.rtf.open .rtf--ab__c:nth-child(3).top {
transform: translateY(180px) scale(1);
}
.rtf.open .rtf--ab__c:nth-child(4) {
transform: translateY(-240px) scale(1);
transition-delay: 0.15s;
}
.rtf.open .rtf--ab__c:nth-child(4).top {
transform: translateY(240px) scale(1);
}
.rtf.open .rtf--ab__c:nth-child(5) {
transform: translateY(-300px) scale(1);
transition-delay: 0.18s;
}
.rtf.open .rtf--ab__c:nth-child(5).top {
transform: translateY(300px) scale(1);
}
.rtf.open .rtf--ab__c:nth-child(6) {
transform: translateY(-360px) scale(1);
transition-delay: 0.21s;
}
.rtf.open .rtf--ab__c:nth-child(6).top {
transform: translateY(360px) scale(1);
}
.rtf--mb__c {
padding: 25px;
margin: -25px;
}
.rtf--mb__c *:last-child {
margin-bottom: 0;
}
.rtf--mb__c:hover > span {
transition: ease-in-out opacity 0.2s;
opacity: 0.9;
}
.rtf--mb__c > span.always-show {
transition: ease-in-out opacity 0.2s;
opacity: 0.9;
}
.rtf--mb__c > span {
opacity: 0;
transition: ease-in-out opacity 0.2s;
position: absolute;
top: 50%;
transform: translateY(-50%);
margin-right: 6px;
margin-left: 4px;
background: rgba(0, 0, 0, 0.75);
padding: 2px 4px;
border-radius: 2px;
color: white;
font-size: 13px;
box-shadow: 0 0 4px rgba(0, 0, 0, 0.14), 0 4px 8px rgba(0, 0, 0, 0.28);
}
.rtf--mb__c > span.right {
right: 100%;
}
.rtf--mb {
height: 56px;
width: 56px;
z-index: 9999;
/* background-color: #666666; */
background: #387cec;
/* background: var(--color-btn-bg); */
display: inline-flex;
justify-content: center;
align-items: center;
position: relative;
border: none;
/* border: 1px solid #555; */
border-radius: 50%;
box-shadow: 0 0 4px rgba(0, 0, 0, 0.14), 0 4px 8px rgba(0, 0, 0, 0.28);
cursor: pointer;
outline: none;
padding: 0;
-webkit-user-drag: none;
font-weight: bold;
color: #f1f1f1;
font-size: 18px;
}
.rtf--mb > * {
transition: ease-in-out transform 0.2s;
}
.rtf--ab__c {
display: block;
position: absolute;
top: 0;
right: 1px;
padding: 10px 0;
margin: -10px 0;
transition: ease-in-out transform 0.2s;
}
.rtf--ab__c > span {
opacity: 0;
transition: ease-in-out opacity 0.2s;
position: absolute;
top: 50%;
transform: translateY(-50%);
margin-right: 6px;
background: rgba(0, 0, 0, 0.75);
padding: 2px 4px;
border-radius: 2px;
color: white;
font-size: 13px;
box-shadow: 0 0 4px rgba(0, 0, 0, 0.14), 0 4px 8px rgba(0, 0, 0, 0.28);
}
.rtf--ab__c > span.right {
right: 100%;
}
.rtf--ab__c:nth-child(1) {
transform: translateY(-60px) scale(0);
transition-delay: 0.21s;
}
.rtf--ab__c:nth-child(1).top {
transform: translateY(60px) scale(0);
}
.rtf--ab__c:nth-child(2) {
transform: translateY(-120px) scale(0);
transition-delay: 0.18s;
}
.rtf--ab__c:nth-child(2).top {
transform: translateY(120px) scale(0);
}
.rtf--ab__c:nth-child(3) {
transform: translateY(-180px) scale(0);
transition-delay: 0.15s;
}
.rtf--ab__c:nth-child(3).top {
transform: translateY(180px) scale(0);
}
.rtf--ab__c:nth-child(4) {
transform: translateY(-240px) scale(0);
transition-delay: 0.12s;
}
.rtf--ab__c:nth-child(4).top {
transform: translateY(240px) scale(0);
}
.rtf--ab__c:nth-child(5) {
transform: translateY(-300px) scale(0);
transition-delay: 0.09s;
}
.rtf--ab__c:nth-child(5).top {
transform: translateY(300px) scale(0);
}
.rtf--ab__c:nth-child(6) {
transform: translateY(-360px) scale(0);
transition-delay: 0.03s;
}
.rtf--ab__c:nth-child(6).top {
transform: translateY(360px) scale(0);
}
.rtf--ab {
height: 48px;
width: 48px;
background-color: #aaaaaa;
display: inline-flex;
justify-content: center;
align-items: center;
position: relative;
border: none;
border-radius: 50%;
box-shadow: 0 0 4px rgba(0, 0, 0, 0.14), 0 4px 8px rgba(0, 0, 0, 0.28);
cursor: pointer;
outline: none;
padding: 0;
-webkit-user-drag: none;
font-weight: bold;
color: #f1f1f1;
margin-right: 4px;
font-size: 16px;
z-index: 10000;
}
.rtf--ab:hover {
background: #387cec;
border: 1px solid #387cec;
color: #fff;
}
.rtf--ab:focus {
border-color: var(--color-focus-blue);
}

View file

@ -2,12 +2,11 @@ import React from 'react';
import s from './Basic.module.css'; import s from './Basic.module.css';
export function SectionNameType({ name, type, dropDown }) { export function SectionNameType({ name, type }) {
return ( return (
<h2 className={s.sectionNameType}> <h2 className={s.sectionNameType}>
<span>{name}</span> <span>{name}</span>
<span>{type}</span> <span>{type}</span>
{dropDown}
</h2> </h2>
); );
} }

9
src/hooks/basic.js Normal file
View file

@ -0,0 +1,9 @@
import React from 'react';
const { useState, useCallback } = React;
export function useToggle(initialValue = false) {
const [isOn, setState] = useState(initialValue);
const toggle = useCallback(() => setState(x => !x), []);
return [isOn, toggle];
}

View file

@ -3,7 +3,10 @@ import {
selectChartStyleIndex, selectChartStyleIndex,
updateAppConfig updateAppConfig
} from './app'; } from './app';
import { initialState as proxies } from './proxies'; import {
initialState as proxies,
toggleUnavailableProxiesFilter
} from './proxies';
import { initialState as modals } from './modals'; import { initialState as modals } from './modals';
import { initialState as configs } from './configs'; import { initialState as configs } from './configs';
import { initialState as rules } from './rules'; import { initialState as rules } from './rules';
@ -20,5 +23,7 @@ export const initialState = {
export const actions = { export const actions = {
selectChartStyleIndex, selectChartStyleIndex,
updateAppConfig updateAppConfig,
// proxies
toggleUnavailableProxiesFilter
}; };

View file

@ -1,5 +1,3 @@
// @flow
// vim: set ft=javascript.flow :
import * as proxiesAPI from '../api/proxies'; import * as proxiesAPI from '../api/proxies';
import { getLatencyTestUrl } from './app'; import { getLatencyTestUrl } from './app';
@ -27,7 +25,7 @@ const ProxyTypes = ['Shadowsocks', 'Snell', 'Socks5', 'Http', 'Vmess'];
export const getProxies = s => s.proxies.proxies; export const getProxies = s => s.proxies.proxies;
export const getDelay = s => s.proxies.delay; export const getDelay = s => s.proxies.delay;
export const getRtFilterSwitch = s => s.filterZeroRT; export const getRtFilterSwitch = s => s.proxies.filterZeroRT;
export const getProxyGroupNames = s => s.proxies.groupNames; export const getProxyGroupNames = s => s.proxies.groupNames;
export const getProxyProviders = s => s.proxies.proxyProviders || []; export const getProxyProviders = s => s.proxies.proxyProviders || [];
export const getDangleProxyNames = s => s.proxies.dangleProxyNames; export const getDangleProxyNames = s => s.proxies.dangleProxyNames;
@ -188,6 +186,15 @@ export function requestDelayAll(apiConfig) {
}; };
} }
export function toggleUnavailableProxiesFilter() {
return (dispatch, getState) => {
const preState = getRtFilterSwitch(getState());
dispatch('store/proxies#toggleUnavailableProxiesFilter', s => {
s.proxies.filterZeroRT = !preState;
});
};
}
function retrieveGroupNamesFrom(proxies) { function retrieveGroupNamesFrom(proxies) {
let groupNames = []; let groupNames = [];
let globalAll; let globalAll;
@ -243,5 +250,5 @@ export const initialState = {
proxies: {}, proxies: {},
delay: {}, delay: {},
groupNames: [], groupNames: [],
filterZeroRT: true filterZeroRT: false
}; };

View file

@ -6692,6 +6692,11 @@ react-tabs@^3.1.0:
classnames "^2.2.0" classnames "^2.2.0"
prop-types "^15.5.0" prop-types "^15.5.0"
react-tiny-fab@^3.4.0:
version "3.4.0"
resolved "https://registry.yarnpkg.com/react-tiny-fab/-/react-tiny-fab-3.4.0.tgz#65edafa65826aaab8da8cca5f6e099ee81c52eaa"
integrity sha512-8R1z0k5I/tcQFDDJHGRycyiAm991htdvgpaSgT1dB83SiG89L1VQJE7TVEaoDng8R50+fxLZaoOCUkNFmZBKgA==
react-window@^1.8.5: react-window@^1.8.5:
version "1.8.5" version "1.8.5"
resolved "https://registry.yarnpkg.com/react-window/-/react-window-1.8.5.tgz#a56b39307e79979721021f5d06a67742ecca52d1" resolved "https://registry.yarnpkg.com/react-window/-/react-window-1.8.5.tgz#a56b39307e79979721021f5d06a67742ecca52d1"