Skip to content
Merged
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
91 changes: 80 additions & 11 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
}
}
},
"angular-redux-demo": {
"angular-redux-simple-demo": {
"projectType": "application",
"schematics": {
"@schematics/angular:component": {
Expand Down Expand Up @@ -64,25 +64,25 @@
"skipTests": true
}
},
"root": "projects/angular-redux-demo",
"sourceRoot": "projects/angular-redux-demo/src",
"root": "projects/angular-redux-simple-demo",
"sourceRoot": "projects/angular-redux-simple-demo/src",
"prefix": "app",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:application",
"options": {
"outputPath": "dist/angular-redux-demo",
"index": "projects/angular-redux-demo/src/index.html",
"browser": "projects/angular-redux-demo/src/main.ts",
"outputPath": "dist/angular-redux-simple-demo",
"index": "projects/angular-redux-simple-demo/src/index.html",
"browser": "projects/angular-redux-simple-demo/src/main.ts",
"polyfills": ["zone.js"],
"tsConfig": "projects/angular-redux-demo/tsconfig.app.json",
"tsConfig": "projects/angular-redux-simple-demo/tsconfig.app.json",
"assets": [
{
"glob": "**/*",
"input": "projects/angular-redux-demo/public"
"input": "projects/angular-redux-simple-demo/public"
}
],
"styles": ["projects/angular-redux-demo/src/styles.css"],
"styles": ["projects/angular-redux-simple-demo/src/styles.css"],
"scripts": []
},
"configurations": {
Expand Down Expand Up @@ -113,10 +113,79 @@
"builder": "@angular-devkit/build-angular:dev-server",
"configurations": {
"production": {
"buildTarget": "angular-redux-demo:build:production"
"buildTarget": "angular-redux-simple-demo:build:production"
},
"development": {
"buildTarget": "angular-redux-demo:build:development"
"buildTarget": "angular-redux-simple-demo:build:development"
}
},
"defaultConfiguration": "development"
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n"
}
}
},
"angular-redux-injector-demo": {
"projectType": "application",
"schematics": {},
"root": "projects/angular-redux-injector-demo",
"sourceRoot": "projects/angular-redux-injector-demo/src",
"prefix": "app",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:application",
"options": {
"outputPath": "dist/angular-redux-injector-demo",
"index": "projects/angular-redux-injector-demo/src/index.html",
"browser": "projects/angular-redux-injector-demo/src/main.ts",
"polyfills": [
"zone.js"
],
"tsConfig": "projects/angular-redux-injector-demo/tsconfig.app.json",
"assets": [
{
"glob": "**/*",
"input": "projects/angular-redux-injector-demo/public"
}
],
"styles": [
"projects/angular-redux-injector-demo/src/styles.css"
],
"scripts": []
},
"configurations": {
"production": {
"budgets": [
{
"type": "initial",
"maximumWarning": "500kB",
"maximumError": "1MB"
},
{
"type": "anyComponentStyle",
"maximumWarning": "2kB",
"maximumError": "4kB"
}
],
"outputHashing": "all"
},
"development": {
"optimization": false,
"extractLicenses": false,
"sourceMap": true
}
},
"defaultConfiguration": "production"
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"configurations": {
"production": {
"buildTarget": "angular-redux-injector-demo:build:production"
},
"development": {
"buildTarget": "angular-redux-injector-demo:build:development"
}
},
"defaultConfiguration": "development"
Expand Down
27 changes: 27 additions & 0 deletions projects/angular-redux-injector-demo/src/app/app.component.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import { Component, EnvironmentInjector, inject } from '@angular/core';
import { injectSelector, injectDispatch } from '@reduxjs/angular-redux';
import { incrementByRandomNumber } from './store/counter-slice';
import { AppDispatch, RootState } from './store';

@Component({
selector: 'app-root',
standalone: true,
template: `
<button (click)="incrementByRandomNumber()">
Increment by a random number
</button>
<p>{{ count() }}</p>
@if (isLoading()) {
<p>Loading...</p>
}
`,
})
export class AppComponent {
injector = inject(EnvironmentInjector);
count = injectSelector((state: RootState) => state.counter.value);
isLoading = injectSelector((state: RootState) => state.counter.isLoading);
dispatch = injectDispatch<AppDispatch>();
incrementByRandomNumber = () => {
this.dispatch(incrementByRandomNumber({ injector: this.injector }));
};
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { Injectable } from '@angular/core';

@Injectable({ providedIn: 'root' })
export class RandomNumberService {
getRandomNumber() {
return new Promise<number>((resolve) => {
setTimeout(() => {
resolve(Math.floor(Math.random() * 100));
}, 1000);
});
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
import { inject } from '@angular/core';
import { RandomNumberService } from '../services/random-number.service';
import {
asyncRunInInjectionContext,
RunInInjectionContextProps,
} from '../utils/async-run-in-injection-context';

export const incrementByRandomNumber = createAsyncThunk(
'counter/incrementByAmountFromService',
(arg: RunInInjectionContextProps<{}>, _thunkAPI) => {
return asyncRunInInjectionContext(arg.injector, async () => {
const service = inject(RandomNumberService);
const newCount = await service.getRandomNumber();
return newCount;
});
},
);

export const counterSlice = createSlice({
name: 'counter',
initialState: {
value: 0,
isLoading: false,
},
reducers: {},
extraReducers: (builder) => {
builder.addCase(incrementByRandomNumber.fulfilled, (state, action) => {
state.isLoading = false;
state.value += action.payload;
});
builder.addCase(incrementByRandomNumber.pending, (state) => {
state.isLoading = true;
});
},
});

export default counterSlice.reducer;
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import { EnvironmentInjector, runInInjectionContext } from '@angular/core';

export const asyncRunInInjectionContext = <TReturn>(
injector: EnvironmentInjector,
fn: () => Promise<TReturn>,
) => {
return new Promise<TReturn>((resolve, reject) => {
runInInjectionContext(injector, () => {
fn()
.then((value) => {
resolve(value);
})
.catch((error) => {
reject(error);
});
});
});
};

export type RunInInjectionContextProps<
T extends object,
> = T & {
injector: EnvironmentInjector;
};
13 changes: 13 additions & 0 deletions projects/angular-redux-injector-demo/src/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>AngularReduxInjectorDemo</title>
<base href="/">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/x-icon" href="favicon.ico">
</head>
<body>
<app-root></app-root>
</body>
</html>
6 changes: 6 additions & 0 deletions projects/angular-redux-injector-demo/src/main.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import { bootstrapApplication } from '@angular/platform-browser';
import { appConfig } from './app/app.config';
import { AppComponent } from './app/app.component';

bootstrapApplication(AppComponent, appConfig)
.catch((err) => console.error(err));
15 changes: 15 additions & 0 deletions projects/angular-redux-injector-demo/tsconfig.app.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/* To learn more about Typescript configuration file: https://www.typescriptlang.org/docs/handbook/tsconfig-json.html. */
/* To learn more about Angular compiler options: https://angular.dev/reference/configs/angular-compiler-options. */
{
"extends": "../../tsconfig.json",
"compilerOptions": {
"outDir": "../../out-tsc/app",
"types": []
},
"files": [
"src/main.ts"
],
"include": [
"src/**/*.d.ts"
]
}
Binary file not shown.
10 changes: 10 additions & 0 deletions projects/angular-redux-simple-demo/src/app/app.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { ApplicationConfig, provideZoneChangeDetection } from '@angular/core';
import { provideRedux } from '@reduxjs/angular-redux';
import { store } from './store';

export const appConfig: ApplicationConfig = {
providers: [
provideZoneChangeDetection({ eventCoalescing: true }),
provideRedux({ store }),
],
};
13 changes: 13 additions & 0 deletions projects/angular-redux-simple-demo/src/app/store/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { configureStore } from '@reduxjs/toolkit';
import counterReducer from './counter-slice';

export const store = configureStore({
reducer: {
counter: counterReducer,
},
});

// Infer the `RootState` and `AppDispatch` types from the store itself
export type RootState = ReturnType<typeof store.getState>;
// Inferred type: {counter: CounterState}
export type AppDispatch = typeof store.dispatch;
1 change: 1 addition & 0 deletions projects/angular-redux-simple-demo/src/styles.css
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/* You can add global styles to this file, and also import other style files */