diff --git a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ChangeTabComponents.tsx b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ChangeTabComponents.tsx index 76807f37e0..b79d41b177 100644 --- a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ChangeTabComponents.tsx +++ b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ChangeTabComponents.tsx @@ -51,4 +51,14 @@ export const Tabs = ({ children }: PropsWithChildren) => ( ); -export const TabPanel = MuiTabPanel; +export const TabPanel = styled(MuiTabPanel, { + shouldForwardProp: (prop) => prop !== 'variant', +})<{ variant?: 'diff' | 'change' }>(({ theme, variant }) => + variant === 'diff' + ? { + padding: theme.spacing(2), + borderRadius: theme.shape.borderRadiusLarge, + border: `1px solid ${theme.palette.divider}`, + } + : {}, +); diff --git a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/EnvironmentStrategyExecutionOrder/EnvironmentStrategyExecutionOrder.tsx b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/EnvironmentStrategyExecutionOrder/EnvironmentStrategyExecutionOrder.tsx index 9dd554f918..63e79fe0ce 100644 --- a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/EnvironmentStrategyExecutionOrder/EnvironmentStrategyExecutionOrder.tsx +++ b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/EnvironmentStrategyExecutionOrder/EnvironmentStrategyExecutionOrder.tsx @@ -114,7 +114,7 @@ export const EnvironmentStrategyExecutionOrder = ({ ))} - + ({ overflowX: 'auto', @@ -17,14 +19,19 @@ interface IDiffProps { data: StrategyIds; } -export const EnvironmentStrategyOrderDiff = ({ preData, data }: IDiffProps) => ( - - a.index - b.index} - /> - -); +export const EnvironmentStrategyOrderDiff = ({ preData, data }: IDiffProps) => { + const useNewDiff = useUiFlag('improvedJsonDiff'); + const Wrapper = useNewDiff ? Fragment : StyledCodeSection; + + return ( + + a.index - b.index} + /> + + ); +}; diff --git a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ReleasePlanChange.tsx b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ReleasePlanChange.tsx index 7cabd17f99..ad5a7ffde5 100644 --- a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ReleasePlanChange.tsx +++ b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ReleasePlanChange.tsx @@ -131,7 +131,7 @@ const StartMilestone: FC<{ - + - + - + - + )} - + ) : null} - + ) : null} - +