Skip to content

chore: Design changes for Editor tabs #38326

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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
hetunandu merged 8 commits into from
Dec 27, 2024
Merged

chore: Design changes for Editor tabs #38326

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d7fb204
Bold text of active tab
hetunandu Dec 23, 2024
fb386db
Enable rename for new items
hetunandu Dec 23, 2024
d9985d0
chore: Increase tab top border height
hetunandu Dec 26, 2024
806bdbe
Merge branch 'release' into chore/editor-tabs-design
hetunandu Dec 27, 2024
b279053
fix: Fix Create JS method
hetunandu Dec 27, 2024
8fa3eee
Merge branch 'release' into chore/editor-tabs-design
hetunandu Dec 27, 2024
ce01690
chore: Remove renaming via url
hetunandu Dec 27, 2024
8a6f2fa
Discard changes to app/client/cypress/support/Pages/JSEditor.ts
hetunandu Dec 27, 2024
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
7 changes: 5 additions & 2 deletions app/client/src/IDE/Components/EditableName/useIsRenaming.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,20 @@ export const useIsRenaming = (id: string) => {

const isEditingViaExternal = useSelector(getIsRenaming(id));

const isNew =

@alex-golovanov alex-golovanov Dec 26, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One thing to keep in mind is that isNew will not automatically update on history changes unless something else forces a re-render of this component. In other words it will not watch for route changes and will not update state by itself.

Disregard, if this is the desired behavior.

@hetunandu hetunandu Dec 27, 2024

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed this for now. Needs a relook

new URLSearchParams(window.location.search).get("editName") === "true";

useEffect(
function onExternalEditEvent() {
if (isEditingViaExternal) {
if (isEditingViaExternal || isNew) {
setIsEditing(true);
}

return () => {
setIsEditing(false);
};
},
[isEditingViaExternal],
[isEditingViaExternal, isNew],
);

const enterEditMode = useCallback(() => {
Expand Down
8 changes: 6 additions & 2 deletions app/client/src/IDE/Components/FileTab/styles.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ export const Tab = styled.div`
color: var(--ads-v2-colors-text-default);
cursor: pointer;
gap: var(--ads-v2-spaces-2);
border-top: 1px solid transparent;
border-top-left-radius: var(--ads-v2-border-radius);
border-top-right-radius: var(--ads-v2-border-radius);
align-items: center;
Expand All @@ -19,14 +18,18 @@ export const Tab = styled.div`
padding-top: 6px; // to accommodate border and make icons align correctly
border-left: 1px solid transparent;
border-right: 1px solid transparent;
border-top: 2px solid transparent;
border-top: 3px solid transparent;
flex-shrink: 0;

&.active {
background: var(--ads-v2-colors-control-field-default-bg);
border-top-color: var(--ads-v2-color-bg-brand);
border-left-color: var(--ads-v2-color-border-muted);
border-right-color: var(--ads-v2-color-border-muted);

span {
font-weight: var(--ads-v2-font-weight-bold);
}
}

& > .tab-close {
Expand All @@ -48,6 +51,7 @@ export const IconContainer = styled.div`
align-items: center;
justify-content: center;
flex-shrink: 0;

img {
width: 12px;
}
Expand Down