Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Addressing multiple PCD overlay feedback #2964

Merged
merged 21 commits into from
May 9, 2023
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { PillButton, PopoutSectionTitle } from "@fiftyone/components";
import * as fos from "@fiftyone/state";
import ViewComfyIcon from "@mui/icons-material/ViewComfy";
import React, { useRef, useState } from "react";
import { useRef, useState } from "react";
import useMeasure from "react-use-measure";

import {
Expand All @@ -20,7 +20,7 @@ interface GroupMediaVisibilityProps {
modal: boolean;
}

const TITLE = "Toggle Media";
const TITLE = "Toggle media";

const Container = styled.div`
position: relative;
Expand Down
2 changes: 1 addition & 1 deletion app/packages/core/src/components/Actions/utils.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ export const tagParameters = ({
...params,
label_fields: activeFields,
target_labels: targetLabels,
slices: !groups ? [groupData?.slices] : null,
slices: !groups ? groupData?.slices : null,
group_id: params.modal ? groupData?.id : null,
sample_ids: getSampleIds(),
labels:
Expand Down
2 changes: 1 addition & 1 deletion app/packages/core/src/components/Modal/Modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ const SampleModal = () => {
onBlur={() => {
controller.set({ zIndex: "0" });
}}
disabled={isOther || isLabelTag}
disabled={isOther || isLabelTag || isTag}
key={key}
trigger={trigger}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export const PathEntryCounts = ({
return shown.state === "loading" ? (
<LoadingDots text="" />
) : (
typeof shown.contents === "number" && (
shown.contents && (
<SuspenseEntryCounts
countAtom={getAtom(false)}
subcountAtom={getAtom(true)}
Expand Down
10 changes: 5 additions & 5 deletions app/packages/looker-3d/src/action-bar/SliceSelector.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ export const SliceSelector = () => {
}

if (activePcdSlices.length === 1) {
return `${activePcdSlices[0]} selected`;
return `Showing ${activePcdSlices[0]}`;
}
if (activePcdSlices.length === 2) {
return activePcdSlices.join(" and ");
}
if (activePcdSlices.length === allPcdSlices.length) {
return "All pcds selected";
return "Showing all point clouds";
}
return `${activePcdSlices.length} point-clouds selected`;
return `Showing ${activePcdSlices.length} point clouds`;
}, [activePcdSlices, allPcdSlices]);

const handleActionClick = useCallback(() => {
Expand All @@ -43,7 +43,7 @@ export const SliceSelector = () => {

return (
<>
<ActionItem title="Select pcds">
<ActionItem title="Select point clouds">
sashankaryal marked this conversation as resolved.
Show resolved Hide resolved
<div onClick={handleActionClick}>{activeSlicesLabel}</div>
</ActionItem>

Expand All @@ -69,7 +69,7 @@ const PcdsSelector = () => {

return (
<ActionPopOver>
<PopoutSectionTitle>Select pcds</PopoutSectionTitle>
<PopoutSectionTitle>Select point clouds</PopoutSectionTitle>
<div>
{allPcdSlices.map((slice) => {
return (
Expand Down