fix: restore page-add functionality

meetalva · May 24, 2018 · cda183e · cda183e
1 parent 65d5ef3
commit cda183e
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 15 deletions.
diff --git a/src/component/page-list/page-add-button.tsx b/src/component/page-list/page-add-button.tsx
@@ -10,8 +10,11 @@ export class PageAddButton extends React.Component {
 		e.preventDefault();
 		const store = ViewStore.getInstance();
 		const page = store.addNewPage();
-		// store.openPage(page.getId());
-		page.setNameState(EditState.Editing);
+
+		if (page) {
+			store.setActivePage(page);
+			page.setNameState(EditState.Editing);
+		}
 	}
 
 	public render(): JSX.Element {

diff --git a/src/component/page-list/page-tile-container.tsx b/src/component/page-list/page-tile-container.tsx
@@ -41,12 +41,12 @@ export class PageTileContainer extends React.Component<PageTileContainerProps> {
 	}
 
 	protected handleClick(e: React.MouseEvent<HTMLElement>): void {
-		// const store = Store.getInstance();
+		const store = ViewStore.getInstance();
 
 		const target = e.target as HTMLElement;
 
 		if (!this.props.focused) {
-			// store.openPage(this.props.page.getId());
+			store.setActivePage(this.props.page);
 		}
 
 		if (this.props.focused && target.matches('[data-title]')) {
@@ -65,7 +65,7 @@ export class PageTileContainer extends React.Component<PageTileContainerProps> {
 				? Types.AlvaView.PageDetail
 				: Types.AlvaView.Pages;
 
-		// store.openPage(this.props.page.getId());
+		store.setActivePage(this.props.page);
 		store.setActiveView(next);
 	}
 

diff --git a/src/electron/main.ts b/src/electron/main.ts
@@ -94,7 +94,7 @@ async function createWindow(): Promise<void> {
 			case ServerMessageType.CreateNewFileRequest: {
 				const path = await showSaveDialog({
 					title: 'Create New Alva File',
-					defaultPath: 'Untitled.alva',
+					defaultPath: 'Untitled Project.alva',
 					filters: [
 						{
 							name: 'Alva File',
@@ -105,7 +105,7 @@ async function createWindow(): Promise<void> {
 
 				if (path) {
 					const project = Project.create({
-						name: 'Untitled',
+						name: 'Untitled Page',
 						path
 					});
 

diff --git a/src/store/view-store.ts b/src/store/view-store.ts
@@ -137,19 +137,25 @@ export class ViewStore {
 		return ViewStore.INSTANCE;
 	}
 
-	public addNewPage(): Page {
-		const project = this.currentProject as Project;
+	public addNewPage(): Page | undefined {
+		const project = this.currentProject;
 
-		// Page refs register with their project automatically
-		// via side effects
-		const pageRef = Page.create({
-			name: 'New Page',
+		if (!project) {
+			return;
+		}
+
+		const name = 'Untitled Page';
+
+		const count = project.getPages().filter(p => p.getName().startsWith(name)).length;
+
+		const page = Page.create({
+			name: `${name} ${count + 1}`,
 			styleguide: project.getStyleguide()
 		});
 
-		// pageRef.createFile();
+		project.addPage(page);
 
-		return pageRef;
+		return page;
 	}
 
 	/**