Skip to content

Commit

Permalink
fix: scroll to section sooner when SSR + simplify item ids
Browse files Browse the repository at this point in the history
  • Loading branch information
RomanHotsiy committed Mar 22, 2018
1 parent 28c487d commit d1d8042
Show file tree
Hide file tree
Showing 9 changed files with 39 additions and 43 deletions.
2 changes: 1 addition & 1 deletion src/components/ContentItems/ContentItems.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export class TagItem extends React.Component<ContentItemProps> {
<Row>
<MiddlePanel key="middle">
<H1>
<ShareLink href={'#' + this.props.item.getHash()} />
<ShareLink href={'#' + this.props.item.id} />
{name}
</H1>
{description !== undefined && <Markdown source={description} />}
Expand Down
2 changes: 1 addition & 1 deletion src/components/Operation/Operation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export class Operation extends React.Component<OperationProps> {
<OperationRow>
<MiddlePanel>
<H2>
<ShareLink href={'#' + operation.getHash()} />
<ShareLink href={'#' + operation.id} />
{summary} {deprecated && <Badge type="warning"> Deprecated </Badge>}
</H2>
{options.pathInMiddlePanel && <Endpoint operation={operation} inverted={true} />}
Expand Down
2 changes: 1 addition & 1 deletion src/components/SideMenu/MenuItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export class MenuItem extends React.Component<MenuItemProps> {
render() {
const { item, withoutChildren } = this.props;
return (
<MenuItemLi onClick={this.activate} depth={item.depth} innerRef={this.saveRef}>
<MenuItemLi onClick={this.activate} depth={item.depth} innerRef={this.saveRef} data-item-id={item.id}>
{item.type === 'operation' ? (
<OperationMenuItemContent item={item as OperationModel} />
) : (
Expand Down
5 changes: 5 additions & 0 deletions src/services/AppStore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { observe } from 'mobx';

import { OpenAPISpec } from '../types';
import { loadAndBundleSpec } from '../utils/loadAndBundleSpec';
import { HistoryService } from './HistoryService';
import { MarkerService } from './MarkerService';
import { MenuStore } from './MenuStore';
import { SpecStore } from './models';
Expand Down Expand Up @@ -63,6 +64,10 @@ export class AppStore {
this.rawOptions = options;
this.options = new RedocNormalizedOptions(options);
this.scroll = new ScrollService(this.options);

// update position statically based on hash (in case of SSR)
MenuStore.updateOnHash(HistoryService.hash, this.scroll);

this.spec = new SpecStore(spec, specUrl, this.options);
this.menu = new MenuStore(this.spec, this.scroll);

Expand Down
43 changes: 17 additions & 26 deletions src/services/MenuStore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { GroupModel, OperationModel, SpecStore } from './models';
import { HistoryService } from './HistoryService';
import { ScrollService } from './ScrollService';

import { flattenByProp } from '../utils';
import { flattenByProp, normalizeHash } from '../utils';
import { GROUP_DEPTH } from './MenuBuilder';

export type MenuItemGroupType = 'group' | 'tag' | 'section';
Expand All @@ -24,7 +24,6 @@ export interface IMenuItem {
deprecated?: boolean;
type: MenuItemType;

getHash(): string;
deactivate(): void;
activate(): void;
}
Expand All @@ -35,6 +34,17 @@ export const SECTION_ATTR = 'data-section-id';
* Stores all side-menu related information
*/
export class MenuStore {
/**
* Statically try update scroll position
* Used before hydrating from server-side rendered html to scroll page faster
*/
static updateOnHash(hash: string = HistoryService.hash, scroll: ScrollService) {
if (!hash) {
return;
}
scroll.scrollIntoViewBySelector(`[${SECTION_ATTR}="${normalizeHash(hash)}"]`);
}

/**
* active item absolute index (when flattened). -1 means nothing is selected
*/
Expand Down Expand Up @@ -127,32 +137,13 @@ export class MenuStore {
return false;
}
let item: IMenuItem | undefined;
hash = hash.substr(1);
const namespace = hash.split('/')[0];
let ptr = decodeURIComponent(hash.substr(namespace.length + 1));
if (namespace === 'section' || namespace === 'tag') {
const sectionId = ptr.split('/')[0];
ptr = ptr.substr(sectionId.length);

let searchId;
if (namespace === 'section') {
searchId = hash;
} else {
searchId = ptr || namespace + '/' + sectionId;
}
hash = normalizeHash(hash);

item = this.flatItems.find(i => i.id === searchId);
if (item === undefined) {
this._scrollService.scrollIntoViewBySelector(`[${SECTION_ATTR}="${searchId}"]`);
return false;
}
} else if (namespace === 'operation') {
item = this.flatItems.find(i => {
return (i as OperationModel).operationId === ptr;
});
}
item = this.flatItems.find(i => i.id === hash);
if (item) {
this.activateAndScroll(item, false);
} else {
this._scrollService.scrollIntoViewBySelector(`[${SECTION_ATTR}="${hash}"]`);
}
return item !== undefined;
}
Expand Down Expand Up @@ -216,7 +207,7 @@ export class MenuStore {

this.activeItemIdx = item.absoluteIdx!;
if (updateHash) {
HistoryService.update(item.getHash(), rewriteHistory);
HistoryService.update(item.id, rewriteHistory);
}

while (item !== undefined) {
Expand Down
4 changes: 0 additions & 4 deletions src/services/models/Group.model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,4 @@ export class GroupModel implements IMenuItem {
}
this.active = false;
}

getHash() {
return this.id;
}
}
12 changes: 5 additions & 7 deletions src/services/models/Operation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,11 @@ export class OperationModel implements IMenuItem {
parent: GroupModel | undefined,
options: RedocNormalizedOptions,
) {
this.id = operationSpec._$ref;
this.id =
operationSpec.operationId !== undefined
? 'operation/' + operationSpec.operationId
: this.parent !== undefined ? this.parent.id + operationSpec._$ref : operationSpec._$ref;

this.name = getOperationSummary(operationSpec);
this.description = operationSpec.description;

Expand Down Expand Up @@ -130,12 +134,6 @@ export class OperationModel implements IMenuItem {
deactivate() {
this.active = false;
}

getHash() {
return this.operationId !== undefined
? 'operation/' + this.operationId
: this.parent !== undefined ? this.parent.id + this.id : this.id;
}
}

function isNumeric(n) {
Expand Down
8 changes: 5 additions & 3 deletions src/standalone.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,11 @@ export function hydrate(
const store = AppStore.fromJS(state);
debugTimeEnd('Redoc create store');

debugTime('Redoc hydrate');
hydrateComponent(<Redoc store={store} />, element, callback);
debugTimeEnd('Redoc hydrate');
setTimeout(() => {
debugTime('Redoc hydrate');
hydrateComponent(<Redoc store={store} />, element, callback);
debugTimeEnd('Redoc hydrate');
}, 0);
}

/**
Expand Down
4 changes: 4 additions & 0 deletions src/utils/dom.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ export function html2Str(html: string): string {
.join(' ');
}

export function normalizeHash(hash: string): string {
return hash.startsWith('#') ? hash.substr(1) : hash;
}

// scrollIntoViewIfNeeded polyfill

if (typeof Element !== 'undefined' && !(Element as any).prototype.scrollIntoViewIfNeeded) {
Expand Down

0 comments on commit d1d8042

Please sign in to comment.