Skip to content
Open
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
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"packages": ["packages/*"],
"npmClient": "yarn",
"useWorkspaces": true,
"version": "0.11.9",
"version": "0.12.0-alpha.10",
"command": {
"version": {
"message": "chore(release): publish %s"
Expand Down
2 changes: 1 addition & 1 deletion packages/apsara-icons/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@goto-company/icons",
"version": "0.11.9",
"version": "0.12.0-alpha.10",
"description": "Apsara icons",
"scripts": {
"build": "node scripts/build.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/apsara-ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@goto-company/apsara",
"version": "0.11.9",
"version": "0.12.0-alpha.10",
"description": "A list of base components for apsara",
"author": "Praveen Yadav <[email protected]>",
"license": "Apache-2.0",
Expand Down
13 changes: 8 additions & 5 deletions packages/apsara-ui/src/DiffTimeline/DiffTimeline.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ const DiffTable = ({ diff }: any) => {

const DiffTimelineBlock = ({ timelineBlockData }: any) => {
const [isActive, setIsActive] = useState(false);
const { withTag = true } = timelineBlockData;
return (
<li className="apsara-timeline-item diff-timeline__block" color="black">
<div className="apsara-timeline-item-tail"></div>
Expand All @@ -95,7 +96,9 @@ const DiffTimelineBlock = ({ timelineBlockData }: any) => {
{timelineBlockData.user && (
<React.Fragment>
<span className="diff-timeline__details-dot" />
<span className="diff-timeline__details-text">{`by @${timelineBlockData.user}`}</span>
<span className="diff-timeline__details-text">{`by ${withTag ? "@" : ""}${
timelineBlockData.user
}`}</span>
</React.Fragment>
)}
</div>
Expand All @@ -108,11 +111,11 @@ const DiffTimelineBlock = ({ timelineBlockData }: any) => {
</span>
</CollapsibleHeader>
<CollapsibleContent>
{timelineBlockData.renderDiff ?
{timelineBlockData.renderDiff ? (
timelineBlockData.renderDiff()
:
<DiffTable diff={timelineBlockData.diff} />}

) : (
<DiffTable diff={timelineBlockData.diff} />
)}
</CollapsibleContent>
</Collapsible.Root>
)}
Expand Down
6 changes: 5 additions & 1 deletion packages/apsara-ui/src/TableV2/Table.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import React, { useEffect } from "react";
import { StyledTable, PaginationWrapper, TableWrapper, EmptyHeader, EmptyText } from "./Table.styles";
import {
createColumnHelper,
Expand Down Expand Up @@ -77,6 +77,10 @@ function Table({
pageSize: initialPageSize,
});

useEffect(() => {
setPagination({ pageIndex: initialPageIndex, pageSize: initialPageSize });
}, [initialPageIndex, initialPageSize]);

const fetchDataOptions = {
pageIndex,
pageSize,
Expand Down