suzanne.soy/pagraphcontrol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade dependencies

Browse Source
This commit is contained in:
futpib 2020-06-18 16:23:41 +03:00
parent 79bc037cf6
commit b8fb579bbb
19 changed files with 2344 additions and 1955 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
actions/icons.js
View File

@ -18,25 +18,25 @@ const getIconWithFallback = async name => {
return cache.get(name); return cache.get(name);
} }
let res = await freedesktopIcons({ let result = await freedesktopIcons({
name, name,
type: 'scalable', type: 'scalable',
}, iconThemeNames); }, iconThemeNames);
if (!res) { if (!result) {
res = await freedesktopIcons({ result = await freedesktopIcons({
name, name,
size: 128, size: 128,
}, iconThemeNames); }, iconThemeNames);
} }
if (!res && fallbacks.has(name)) { if (!result && fallbacks.has(name)) {
return getIconWithFallback(fallbacks.get(name)); return getIconWithFallback(fallbacks.get(name));
} }
cache.set(name, res); cache.set(name, result);
return res; return result;
}; };
module.exports = createActionCreators({ module.exports = createActionCreators({

6
components/cards/index.js
View File

@ -42,7 +42,7 @@ const SinksOrSourcesPresenter = ({ sinksOrSources, setSinkOrSourcePort }) => map
.filter(Boolean) .filter(Boolean)
.join(' '), .join(' '),
value: sinkOrSource.activePortName, value: sinkOrSource.activePortName,
onChange: e => setSinkOrSourcePort(sinkOrSource.index, e.target.value), onChange: ({ target: { value } }) => setSinkOrSourcePort(sinkOrSource.index, value),
}), }),
]), values(filter(s => s.ports.length > 0, sinksOrSources))); ]), values(filter(s => s.ports.length > 0, sinksOrSources)));
@ -126,8 +126,8 @@ class Cards extends React.Component {
.filter(Boolean) .filter(Boolean)
.join(' '), .join(' '),
value: card.activeProfileName, value: card.activeProfileName,
onChange: e => { onChange: ({ target: { value } }) => {
this.props.actions.setCardProfile(card.index, e.target.value); this.props.actions.setCardProfile(card.index, value);
}, },
}), }),
]), ]),

20
components/graph/base.js
View File

@ -94,13 +94,13 @@ class GraphView extends GraphViewBase {
|| this.state.edgeEndNode !== nextState.edgeEndNode; || this.state.edgeEndNode !== nextState.edgeEndNode;
} }
componentDidUpdate(prevProps, prevState) { componentDidUpdate(previousProps, previousState) {
const { nodeKey } = this.props; const { nodeKey } = this.props;
if (this.state.edgeEndNode !== prevState.edgeEndNode) { if (this.state.edgeEndNode !== previousState.edgeEndNode) {
if (prevState.edgeEndNode) { if (previousState.edgeEndNode) {
const prevNode = document.querySelector('#node-' + prevState.edgeEndNode[nodeKey]); const previousNode = document.querySelector('#node-' + previousState.edgeEndNode[nodeKey]);
prevNode.classList.remove('targeted'); previousNode.classList.remove('targeted');
} }
if (this.state.edgeEndNode) { if (this.state.edgeEndNode) {
@ -109,9 +109,9 @@ class GraphView extends GraphViewBase {
} }
} }
if (!prevProps.moved && this.props.moved) { if (!previousProps.moved && this.props.moved) {
this.removeEdgeElement(this.props.moved.source, this.props.moved.target); this.removeEdgeElement(this.props.moved.source, this.props.moved.target);
} else if (prevProps.moved && !this.props.moved) { } else if (previousProps.moved && !this.props.moved) {
const container = document.querySelector('#edge-custom-container'); const container = document.querySelector('#edge-custom-container');
if (container) { if (container) {
container.remove(); container.remove();
@ -121,15 +121,15 @@ class GraphView extends GraphViewBase {
if (this.props.selected if (this.props.selected
&& this.props.moved && this.props.moved
&& ( && (
prevProps.selected !== this.props.selected previousProps.selected !== this.props.selected
|| prevProps.moved !== this.props.moved || previousProps.moved !== this.props.moved
) )
&& this.state.draggedEdge && this.state.draggedEdge
) { ) {
this.dragEdge(); this.dragEdge();
} }
super.componentDidUpdate(prevProps, prevState); super.componentDidUpdate(previousProps, previousState);
} }
getMouseCoordinates() { getMouseCoordinates() {

6
components/graph/index.js
View File

@ -1341,7 +1341,7 @@ class Graph extends React.PureComponent {
const types = scan( const types = scan(
next, next,
next(selectionObjectTypes.fromPulseType(selected.type)), next(selectionObjectTypes.fromPulseType(selected.type)),
range(0, 3) range(0, 3),
); );
const bestSelectionPredicate = x => null const bestSelectionPredicate = x => null
@ -1381,8 +1381,8 @@ class Graph extends React.PureComponent {
return false; return false;
} }
const x = direction === 'right' ? 1 : direction === 'left' ? -1 : 0; const x = direction === 'right' ? 1 : (direction === 'left' ? -1 : 0);
const y = direction === 'down' ? 1 : direction === 'up' ? -1 : 0; const y = direction === 'down' ? 1 : (direction === 'up' ? -1 : 0);
moved.x += x * (size + (size / 12)); moved.x += x * (size + (size / 12));
moved.y += y * (size + (size / 12)); moved.y += y * (size + (size / 12));

4
components/graph/layout-engine.test.js
View File

@ -1,7 +1,7 @@
import test from 'ava'; const test = require('ava');
import LayoutEngine from './layout-engine'; const LayoutEngine = require('./layout-engine');
const n = (x, y) => ({ x, y }); const n = (x, y) => ({ x, y });

2
components/graph/peaks.js
View File

@ -126,7 +126,7 @@ class Peaks extends React.Component {
const rope = new PIXI.SimpleRope(this.trailTexture, points); const rope = new PIXI.SimpleRope(this.trailTexture, points);
rope.blendmode = PIXI.BLEND_MODES.ADD; rope.blendmode = PIXI.BLEND_MODES.ADD;
rope.alpha = peak === undefined ? 0 : peak ** (1 / 3); rope.alpha = peak === undefined ? 0 : peak ** (1 / 3);
rope.tint = parseInt(theme.colors.themeSelectedBgColor.replace(/#/g, ''), 16); rope.tint = Number.parseInt(theme.colors.themeSelectedBgColor.replace(/#/g, ''), 16);
return rope; return rope;
}); });

4
components/log/index.js
View File

@ -53,8 +53,8 @@ class Log extends React.Component {
return actionTypeText[item.action] || item.action; return actionTypeText[item.action] || item.action;
} }
componentDidUpdate(prevProps) { componentDidUpdate(previousProps) {
const newItems = differenceWith((a, b) => a === b, this.props.log.items, prevProps.log.items); const newItems = differenceWith((a, b) => a === b, this.props.log.items, previousProps.log.items);
newItems.forEach(item => setTimeout(() => { newItems.forEach(item => setTimeout(() => {
this.removeItem(item); this.removeItem(item);
}, this.props.itemLifetime)); }, this.props.itemLifetime));

6
components/modals/add-remote-server-modal.js
View File

@ -27,8 +27,8 @@ class AddRemoteServerModal extends React.PureComponent {
this.handleSubmit = this.handleSubmit.bind(this); this.handleSubmit = this.handleSubmit.bind(this);
} }
handleSubmit(e) { handleSubmit(event) {
e.preventDefault(); event.preventDefault();
const { address } = this.state; const { address } = this.state;
this.props.setAdd('remoteServerAddresses', address); this.props.setAdd('remoteServerAddresses', address);
@ -56,7 +56,7 @@ class AddRemoteServerModal extends React.PureComponent {
style: { width: '100%' }, style: { width: '100%' },
autoFocus: true, autoFocus: true,
value: this.state.address, value: this.state.address,
onChange: e => this.setState({ address: e.target.value }), onChange: ({ target: { value } }) => this.setState({ address: value }),
}), }),
]), ]),
]), ]),

6
components/modals/connect-to-server.js
View File

@ -26,8 +26,8 @@ class ConnectToServerModal extends React.PureComponent {
this.handleSubmit = this.handleSubmit.bind(this); this.handleSubmit = this.handleSubmit.bind(this);
} }
handleSubmit(e) { handleSubmit(event) {
e.preventDefault(); event.preventDefault();
const subprocess = spawn('pagraphcontrol', [], { const subprocess = spawn('pagraphcontrol', [], {
detached: true, detached: true,
@ -63,7 +63,7 @@ class ConnectToServerModal extends React.PureComponent {
style: { width: '100%' }, style: { width: '100%' },
autoFocus: true, autoFocus: true,
value: this.state.address, value: this.state.address,
onChange: e => this.setState({ address: e.target.value }), onChange: ({ target: { value } }) => this.setState({ address: value }),
}), }),
]), ]),
]), ]),

8
components/modals/load-module.js
View File

@ -28,8 +28,8 @@ class LoadModuleModal extends React.PureComponent {
this.handleSubmit = this.handleSubmit.bind(this); this.handleSubmit = this.handleSubmit.bind(this);
} }
handleSubmit(e) { handleSubmit(event) {
e.preventDefault(); event.preventDefault();
const { name, args } = this.state; const { name, args } = this.state;
this.props.loadModule(name, args); this.props.loadModule(name, args);
@ -55,7 +55,7 @@ class LoadModuleModal extends React.PureComponent {
style: { width: '100%' }, style: { width: '100%' },
autoFocus: true, autoFocus: true,
value: this.state.name, value: this.state.name,
onChange: e => this.setState({ name: e.target.value }), onChange: ({ target: { value } }) => this.setState({ name: value }),
}), }),
]), ]),
]), ]),
@ -66,7 +66,7 @@ class LoadModuleModal extends React.PureComponent {
r(Input, { r(Input, {
style: { width: '100%' }, style: { width: '100%' },
value: this.state.args, value: this.state.args,
onChange: e => this.setState({ args: e.target.value }), onChange: ({ target: { value } }) => this.setState({ args: value }),
}), }),
]), ]),
]), ]),

4
components/network/index.js
View File

@ -88,11 +88,11 @@ const RemoteServer = connect(
' sinks and ', ' sinks and ',
keys(remoteServer.objects.sources).length, keys(remoteServer.objects.sources).length,
' sources.', ' sources.',
]) : targetState === 'ready' ? r(Label, { ]) : (targetState === 'ready' ? r(Label, {
passive: true, passive: true,
}, [ }, [
'Connecting...', 'Connecting...',
]) : null, ]) : null),
]); ]);
}); });

6
components/preferences/index.js
View File

@ -20,9 +20,9 @@ const NumberInput = require('../number-input');
const VolumeRatioInput = ({ pref, fallback, preferences, actions, children }) => r(NumberInput, { const VolumeRatioInput = ({ pref, fallback, preferences, actions, children }) => r(NumberInput, {
type: 'number', type: 'number',
value: defaultTo(fallback, Math.round(preferences[pref] * 100)), value: defaultTo(fallback, Math.round(preferences[pref] * 100)),
onChange: e => { onChange: ({ target: { value } }) => {
const v = defaultTo(fallback, Math.max(0, parseInt(e.target.value, 10))); value = defaultTo(fallback, Math.max(0, Number.parseInt(value, 10)));
actions.set({ [pref]: v / 100 }); actions.set({ [pref]: value / 100 });
}, },
}, children); }, children);

14
components/volume-peaks-provider/index.js
View File

@ -48,12 +48,12 @@ function spawnProcess({ onPeak, onExit }) {
const peak = data.readFloatLE(p); const peak = data.readFloatLE(p);
p += 4; p += 4;
const typeStr = type === PA_SUBSCRIPTION_EVENT_SOURCE const typeString = type === PA_SUBSCRIPTION_EVENT_SOURCE
? 'source' ? 'source'
: type === PA_SUBSCRIPTION_EVENT_SINK_INPUT : (type === PA_SUBSCRIPTION_EVENT_SINK_INPUT
? 'sinkInput' ? 'sinkInput'
: 'unexpected'; : 'unexpected');
onPeak(typeStr, index, peak); onPeak(typeString, index, peak);
} }
}; };
@ -91,10 +91,10 @@ class VolumePeaksProvider extends React.Component {
} }
} }
componentDidUpdate(prevProps, prevState) { componentDidUpdate(previousProps, previousState) {
if (this.state.state !== 'ready' && prevState.state === 'ready') { if (this.state.state !== 'ready' && previousState.state === 'ready') {
this._killProcess(); this._killProcess();
} else if (this.state.state === 'ready' && prevState.state !== 'ready') { } else if (this.state.state === 'ready' && previousState.state !== 'ready') {
this._spawnProcess(); this._spawnProcess();
} }
} }

14
package.json
View File

@ -5,15 +5,15 @@
"main": "index.js", "main": "index.js",
"license": "GPL-3.0", "license": "GPL-3.0",
"devDependencies": { "devDependencies": {
"ava": "^2.2.0", "ava": "^3.9.0",
"electron": "^9.0.4", "electron": "^9.0.4",
"electron-devtools-installer": "^3.0.0", "electron-devtools-installer": "^3.0.0",
"electron-packager": "^14.2.1", "electron-packager": "^14.2.1",
"eslint-config-xo-overrides": "^1.4.0", "eslint-config-xo-overrides": "^1.4.0",
"nyc": "^14.1.1", "nyc": "^15.1.0",
"remotedev-server": "^0.3.1", "remotedev-server": "^0.3.1",
"uws": "^100.0.1", "uws": "^100.0.1",
"xo": "^0.24.0" "xo": "^0.32.0"
}, },
"scripts": { "scripts": {
"start": "NODE_ENV=development electron .", "start": "NODE_ENV=development electron .",
@ -30,15 +30,15 @@
"@futpib/react-electron-menu": "^0.3.1", "@futpib/react-electron-menu": "^0.3.1",
"@jakejarrett/gtk-theme": "^1.1.3", "@jakejarrett/gtk-theme": "^1.1.3",
"bluebird": "^3.7.2", "bluebird": "^3.7.2",
"camelcase": "^5.3.1", "camelcase": "^6.0.0",
"d3": "^5.16.0", "d3": "^5.16.0",
"electron-store": "^5.2.0", "electron-store": "^5.2.0",
"freedesktop-icons": "^0.1.0", "freedesktop-icons": "^0.1.0",
"ini": "^1.3.5", "ini": "^1.3.5",
"mathjs": "^6.0.4", "mathjs": "^7.0.1",
"pixi.js": "^5.2.4", "pixi.js": "^5.2.4",
"r-dom": "^2.4.0", "r-dom": "^2.4.0",
"ramda": "^0.26.1", "ramda": "^0.27.0",
"react": "^16.13.1", "react": "^16.13.1",
"react-digraph": "^6.7.1", "react-digraph": "^6.7.1",
"react-dom": "^16.13.1", "react-dom": "^16.13.1",
@ -50,7 +50,7 @@
"redux": "^4.0.5", "redux": "^4.0.5",
"redux-actions": "^2.6.5", "redux-actions": "^2.6.5",
"redux-devtools-extension": "^2.13.8", "redux-devtools-extension": "^2.13.8",
"redux-persist": "^5.10.0", "redux-persist": "^6.0.0",
"redux-persist-electron-storage": "^2.1.0", "redux-persist-electron-storage": "^2.1.0",
"redux-promise-middleware": "^6.1.2", "redux-promise-middleware": "^6.1.2",
"redux-thunk": "^2.3.0", "redux-thunk": "^2.3.0",

2
reducers/pulse.js
View File

@ -148,7 +148,7 @@ const serverReducer = combineReducers({
}), }),
}); });
const reducer = (state = initialState, action) => { const reducer = (state = initialState, action) => { // eslint-disable-line default-param-last
const { pulseServerId = primaryPulseServer } = action.meta || {}; const { pulseServerId = primaryPulseServer } = action.meta || {};
return over(lensProp(pulseServerId), s => serverReducer(s, action), state); return over(lensProp(pulseServerId), s => serverReducer(s, action), state);
}; };

18
store/pulse-middleware.js
View File

@ -301,16 +301,16 @@ const createPulseClient = (store, pulseServerId = primaryPulseServer) => {
return { return {
handleAction: action => handlePulseActions(null, action), handleAction: action => handlePulseActions(null, action),
storeWillUpdate(prevState, nextState) { storeWillUpdate(previousState, nextState) {
state = nextState; state = nextState;
const prev = getPulseServerState(prevState); const previous = getPulseServerState(previousState);
const next = getPulseServerState(nextState); const next = getPulseServerState(nextState);
if (prev === next) { if (previous === next) {
return; return;
} }
if (prev.targetState !== next.targetState) { if (previous.targetState !== next.targetState) {
if (next.targetState === 'ready') { if (next.targetState === 'ready') {
reconnect(); reconnect();
} else if (next.targetState === 'closed') { } else if (next.targetState === 'closed') {
@ -378,9 +378,9 @@ module.exports = store => {
return next => action => { return next => action => {
const { pulseServerId = primaryPulseServer } = action.meta || {}; const { pulseServerId = primaryPulseServer } = action.meta || {};
const prevState = store.getState(); const previousState = store.getState();
const ret = next(action); const returnValue = next(action);
const nextState = store.getState(); const nextState = store.getState();
@ -393,8 +393,8 @@ module.exports = store => {
const client = clients[pulseServerId]; const client = clients[pulseServerId];
if (client) { if (client) {
client.handleAction(action); client.handleAction(action);
if (prevState !== nextState) { if (previousState !== nextState) {
client.storeWillUpdate(prevState, nextState); client.storeWillUpdate(previousState, nextState);
} }
} }
@ -415,6 +415,6 @@ module.exports = store => {
} }
}); });
return ret; return returnValue;
}; };
}; };

6
utils/plus-minus.test.js
View File

@ -1,9 +1,9 @@
import test from 'ava'; const test = require('ava');
import { map, range } from 'ramda'; const { map, range } = require('ramda');
import plusMinus from './plus-minus'; const plusMinus = require('./plus-minus');
test('plusMinus', t => { test('plusMinus', t => {
t.deepEqual( t.deepEqual(

2
utils/theme/index.js
View File

@ -23,7 +23,7 @@ const resolveColor = (value, depth = 0) => {
} }
return value; return value;
} };
module.exports = { module.exports = {
iconThemeNames: theme.iconThemeNames, iconThemeNames: theme.iconThemeNames,

4159
yarn.lock
View File

File diff suppressed because it is too large Load Diff