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

feat: add highlight for selection and fix svg rendering #49

Merged
merged 3 commits into from
Jun 18, 2021
Merged
Show file tree
Hide file tree
Changes from all 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
725 changes: 342 additions & 383 deletions .pnp.js

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
6 changes: 6 additions & 0 deletions .yarn/versions/71489b15.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
releases:
"@essex-js-toolkit/hierarchy-browser": patch
"@essex-js-toolkit/stories": patch

declined:
- "@essex-js-toolkit/dev"
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import CommunityEdgeList from '../../NeighborList/CommunityEdgeList'
import { ScrollArea } from '../../ScollArea'
import { CommunityDataProvider } from '../../common/dataProviders'
import { useThemesAccentStyle } from '../../hooks/theme'
import { ITableSettings } from '../../types'
import { EntityId, ITableSettings } from '../../types'
import { CommunityTable } from '../CommunityTable'
import { TableExpander } from '../TableExpander'
import { useAdjacentCommunityData } from './hooks/useAdjacentCommunityData'
Expand All @@ -24,100 +24,105 @@ interface IAdajacentCommunities {
visibleColumns: string[] | undefined
minimizeColumns: boolean | undefined
refresh: boolean
selections?: EntityId[]
onSelectionChange: (id: EntityId) => void
}

export const AdjacentCommunities: React.FC<IAdajacentCommunities> = function AdjacentCommunities({
dataProvider,
isOpen,
styles,
visibleColumns,
minimizeColumns,
refresh,
}: IAdajacentCommunities) {
const colorStyle = useThemesAccentStyle(isOpen)
export const AdjacentCommunities: React.FC<IAdajacentCommunities> =
function AdjacentCommunities({
dataProvider,
isOpen,
styles,
visibleColumns,
minimizeColumns,
refresh,
selections,
onSelectionChange,
}: IAdajacentCommunities) {
const colorStyle = useThemesAccentStyle(isOpen)

const {
edgeContentStyle,
edgeEntitiesContentStyle,
edgeEntitiesExpanderClick,
edgeExpanderClick,
edgeListOpen,
edgeEntitiesOpen,
} = useExpandedPanel({ isOpen })
const {
edgeContentStyle,
edgeEntitiesContentStyle,
edgeEntitiesExpanderClick,
edgeExpanderClick,
edgeListOpen,
edgeEntitiesOpen,
} = useExpandedPanel({ isOpen })

const [
setEdgeSelection,
loadMoreEntities,
moreEntitiesToLoad,
edgeEntities,
selectedCommunityEdge,
clearCurrentSelection,
] = useEdgeSelection(dataProvider)
const [
adjacentCommunities,
isAdjacentEntitiesLoading,
] = useAdjacentCommunityData(dataProvider, isOpen, refresh)
const [
setEdgeSelection,
loadMoreEntities,
moreEntitiesToLoad,
edgeEntities,
selectedCommunityEdge,
clearCurrentSelection,
] = useEdgeSelection(dataProvider)
const [adjacentCommunities, isAdjacentEntitiesLoading] =
useAdjacentCommunityData(dataProvider, isOpen, refresh)

return (
<>
{adjacentCommunities && adjacentCommunities.length > 0 ? (
<>
<Spacer style={colorStyle} className={'neighbor-expander-button'}>
{isOpen ? (
<TableExpander
return (
<>
{adjacentCommunities && adjacentCommunities.length > 0 ? (
<>
<Spacer style={colorStyle} className={'neighbor-expander-button'}>
{isOpen ? (
<TableExpander
isOpen={edgeListOpen}
handleButtonClick={edgeExpanderClick}
styles={styles?.neighborExpandButton}
/>
) : null}
</Spacer>
<Content style={edgeContentStyle}>
<CommunityEdgeList
edges={adjacentCommunities}
selectedEdge={selectedCommunityEdge}
onEdgeClick={setEdgeSelection}
clearCurrentSelection={clearCurrentSelection}
isOpen={edgeListOpen}
handleButtonClick={edgeExpanderClick}
styles={styles?.neighborExpandButton}
/>
) : null}
</Spacer>
<Content style={edgeContentStyle}>
<CommunityEdgeList
edges={adjacentCommunities}
selectedEdge={selectedCommunityEdge}
onEdgeClick={setEdgeSelection}
clearCurrentSelection={clearCurrentSelection}
isOpen={edgeListOpen}
styles={styles}
/>
</Content>
</>
) : null}
{isAdjacentEntitiesLoading || edgeEntities?.length > 0 ? (
<>
<Spacer style={colorStyle} className={'neighbor-expander-button'}>
{isOpen ? (
<TableExpander
isOpen={edgeEntitiesOpen}
handleButtonClick={edgeEntitiesExpanderClick}
styles={styles?.neighborExpandButton}
styles={styles}
/>
) : null}
</Spacer>
<Content style={edgeEntitiesContentStyle}>
{edgeEntities?.length > 0 && edgeEntitiesOpen ? (
<ScrollArea
loadMore={loadMoreEntities}
hasMore={moreEntitiesToLoad}
>
<CommunityTable
entities={edgeEntities}
communityId={selectedCommunityEdge?.communityId}
visibleColumns={visibleColumns}
styles={styles}
minimize={minimizeColumns}
</Content>
</>
) : null}
{isAdjacentEntitiesLoading || edgeEntities?.length > 0 ? (
<>
<Spacer style={colorStyle} className={'neighbor-expander-button'}>
{isOpen ? (
<TableExpander
isOpen={edgeEntitiesOpen}
handleButtonClick={edgeEntitiesExpanderClick}
styles={styles?.neighborExpandButton}
/>
</ScrollArea>
) : null}
{isAdjacentEntitiesLoading ? (
<Spinner label={ENTITY_LOADER_MSG} />
) : null}
</Content>
</>
) : null}
</>
)
}
) : null}
</Spacer>
<Content style={edgeEntitiesContentStyle}>
{edgeEntities?.length > 0 && edgeEntitiesOpen ? (
<ScrollArea
loadMore={loadMoreEntities}
hasMore={moreEntitiesToLoad}
>
<CommunityTable
entities={edgeEntities}
communityId={selectedCommunityEdge?.communityId}
visibleColumns={visibleColumns}
styles={styles}
minimize={minimizeColumns}
selections={selections}
onSelectionChange={onSelectionChange}
/>
</ScrollArea>
) : null}
{isAdjacentEntitiesLoading ? (
<Spinner label={ENTITY_LOADER_MSG} />
) : null}
</Content>
</>
) : null}
</>
)
}
const Content = styled.div`
overflow-y: auto;
transition: height 0.2s;
Expand Down
34 changes: 32 additions & 2 deletions packages/hierarchy-browser/src/CommunityCard/CommunityCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,14 @@
* Licensed under the MIT license. See LICENSE file in the project.
*/
import { Spinner } from '@fluentui/react'
import React, { memo, useMemo } from 'react'
import React, { memo, useCallback, useMemo } from 'react'
import styled from 'styled-components'
import { ILoadNeighborCommunities, ISettings } from '..'
import {
EntityId,
ILoadNeighborCommunities,
IOnSelectionChange,
ISettings,
} from '..'
import { EmptyEntityList } from '../EntityItem/EmptyEntityList'
import { ScrollArea } from '../ScollArea'
import { CommunityDataProvider } from '../common/dataProviders'
Expand All @@ -26,6 +31,8 @@ export interface ICommunityCardProps {
settings: ISettings
dataProvider: CommunityDataProvider
toggleUpdate: boolean
selections?: EntityId[]
onSelectionChange?: IOnSelectionChange
}

const ENTITY_LOADER_MSG = 'Fetching entity data...'
Expand All @@ -40,6 +47,8 @@ export const CommunityCard: React.FC<ICommunityCardProps> = memo(
settings,
dataProvider,
toggleUpdate,
selections,
onSelectionChange,
}: ICommunityCardProps) {
const {
isOpen: isOpenProp,
Expand Down Expand Up @@ -69,6 +78,23 @@ export const CommunityCard: React.FC<ICommunityCardProps> = memo(
[isLoading],
)

const handleEntityClick = useCallback(
(entiyId: EntityId) => {
if (onSelectionChange) {
const currentSelection = selections || []
const deduped = new Set(currentSelection)
if (deduped.has(entiyId)) {
deduped.delete(entiyId)
onSelectionChange(Array.from(deduped))
} else {
deduped.add(entiyId)
onSelectionChange(Array.from(deduped))
}
}
},
[onSelectionChange, selections],
)

return (
<Container>
<CommunityOverview
Expand All @@ -94,6 +120,8 @@ export const CommunityCard: React.FC<ICommunityCardProps> = memo(
visibleColumns={visibleColumns}
styles={styles?.table}
minimize={minimizeColumns}
selections={selections}
onSelectionChange={handleEntityClick}
/>
</ScrollArea>
) : null}
Expand All @@ -111,6 +139,8 @@ export const CommunityCard: React.FC<ICommunityCardProps> = memo(
visibleColumns={visibleColumns}
minimizeColumns={minimizeColumns}
refresh={toggleUpdate}
selections={selections}
onSelectionChange={handleEntityClick}
/>
</Flex>
</Container>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,8 @@ export const CommunityOverview: React.FC<ICommunityOverviewProps> = memo(
buttonStyle,
] = useOverviewStyles(styles)

const { showLevel, showMembership, showFilter, showExport } = useControls(
controls,
)
const { showLevel, showMembership, showFilter, showExport } =
useControls(controls)
const communityText = useCommunityText(communityId)

const handleFilterChange = useCallback(
Expand Down Expand Up @@ -193,7 +192,7 @@ const FlexyContainer = styled.div`
const Grid = styled.div`
display: grid;
grid-template-columns: 1fr 1fr 1fr;
grid-column-gap: 5;
grid-column-gap: 8;
grid-row-gap: 1;
width: 100%;
`
Expand Down
26 changes: 22 additions & 4 deletions packages/hierarchy-browser/src/CommunityCard/CommunityTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,28 @@
* Licensed under the MIT license. See LICENSE file in the project.
*/
import { Text } from '@fluentui/react'
import React, { memo, useMemo } from 'react'
import React, { memo, useMemo , useCallback } from 'react'
import styled from 'styled-components'
import { CommunityId, IEntityDetail } from '..'
import { EntityItem } from '../EntityItem/EntityItem'
import { textStyle } from '../common/styles'

import { useTableStyles } from '../hooks/useStyles'
import { ITableSettings } from '../types'
import {
CommunityId,
ITableSettings,
EntityId,
IEntityDetail,
IOnSelectionChange,
} from '../types'


export interface ICommunityTableProps {
entities: IEntityDetail[]
styles?: ITableSettings
communityId?: CommunityId
visibleColumns?: string[]
minimize?: boolean
selections?: EntityId[]
onSelectionChange: (id: EntityId) => void
}

export const CommunityTable: React.FC<ICommunityTableProps> = memo(
Expand All @@ -27,7 +34,14 @@ export const CommunityTable: React.FC<ICommunityTableProps> = memo(
styles,
communityId,
visibleColumns,
selections,
onSelectionChange,
}: ICommunityTableProps) {
const isSelected = useCallback(
(entity: IEntityDetail): boolean | undefined =>
selections && selections.includes(entity.id),
[selections],
)
const attrKeys: string[] = useMemo(() => {
if (visibleColumns) {
return visibleColumns
Expand All @@ -37,6 +51,7 @@ export const CommunityTable: React.FC<ICommunityTableProps> = memo(
}
return Object.keys(entities[0].attrs)
}, [entities, minimize, visibleColumns])

const [
headerVariant,
subheaderVariant,
Expand Down Expand Up @@ -85,6 +100,8 @@ export const CommunityTable: React.FC<ICommunityTableProps> = memo(
attrs={attrKeys}
index={i}
styles={styles}
selected={isSelected(entity)}
onEntityClick={onSelectionChange}
/>
))}
</TableBody>
Expand All @@ -110,6 +127,7 @@ const Bold = styled.div`

const Table = styled.table`
width: 100%;
border-collapse: collapse;
`
const HeaderCell = styled.th`
width: 16%;
Expand Down
Loading