From 25a58acb17d5741824e81615dd7419459d6e9dfc Mon Sep 17 00:00:00 2001 From: Matthew Stratford Date: Mon, 31 May 2021 21:23:33 +0100 Subject: [PATCH] Update Item.tsx --- src/showplanner/Item.tsx | 42 +++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/src/showplanner/Item.tsx b/src/showplanner/Item.tsx index 809156a..110d90a 100644 --- a/src/showplanner/Item.tsx +++ b/src/showplanner/Item.tsx @@ -1,9 +1,10 @@ import React, { memo } from "react"; import { PlanItem, itemId } from "./state"; import { Track, AuxItem } from "../api"; -import { useSelector } from "react-redux"; +import { useDispatch, useSelector } from "react-redux"; import { RootState } from "../rootReducer"; +import * as MixerState from "../mixer/state"; import { Draggable } from "react-beautiful-dnd"; import { ContextMenuTrigger } from "react-contextmenu"; import "./item.scss"; @@ -20,6 +21,7 @@ export const Item = memo(function Item({ index: number; column: number; }) { + const dispatch = useDispatch(); const id = itemId(x); const isReal = "timeslotitemid" in x; const isGhost = "ghostid" in x; @@ -34,20 +36,33 @@ export const Item = memo(function Item({ const isLoaded = loadedItem !== null ? itemId(loadedItem) === id : false; + const showDebug = useSelector( + (state: RootState) => state.settings.showDebugInfo + ); + function triggerClick() { if (column > -1) { - sendBAPSicleChannel({ - channel: column, - command: "LOAD", - weight: index, - }); console.log("Clicking to load:", x); - //dispatch(MixerState.load(column, x)); + + if (process.env.REACT_APP_BAPSICLE_INTERFACE) { + sendBAPSicleChannel({ + channel: column, + command: "LOAD", + weight: index, + }); + return; + } + dispatch(MixerState.load(column, x)); } } + let isDragDisabled = isGhost; + + if (process.env.REACT_APP_BAPSICLE_INTERFACE) { + isDragDisabled = isDragDisabled || isLoaded; + } return ( - + {(provided, snapshot) => (
({ id, column, index })} > - +   {"play_count" in x && ( <> @@ -87,10 +102,11 @@ export const Item = memo(function Item({ > Explicit - - {"weight" in x && x.weight} {index}{" "} - {"weight" in x && x.weight !== index && "!!!!!!!!!!!"} - + {showDebug && ( + + {itemId(x)} {"channel" in x && x.channel + "/" + x.weight} + + )}
)}