Skip to content

Add support for angular strings #39

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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support for angular strings #39

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 8 additions & 4 deletions index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import * as angular from 'angular'
import kebabCase = require('lodash.kebabcase')
import { $injector as defaultInjector } from 'ngimport'
import * as React from 'react'

interface Scope<Props> extends angular.IScope {
Expand Down Expand Up @@ -36,7 +35,6 @@ interface State<Props> {
export function angular2react<Props extends object>(
componentName: string,
component: angular.IComponentOptions,
$injector = defaultInjector
): React.ComponentClass<Props> {

return class extends React.Component<Props, State<Props>> {
Expand All @@ -46,6 +44,7 @@ export function angular2react<Props extends object>(
}

componentWillMount() {
let $injector = angular.element(document.querySelectorAll('[ng-app]')[0]).injector();
this.setState({
scope: Object.assign($injector.get('$rootScope').$new(true), { props: writable(this.props) })
})
Expand All @@ -67,7 +66,12 @@ export function angular2react<Props extends object>(
const bindings: {[key: string]: string} = {}
if (component.bindings) {
for (const binding in component.bindings) {
bindings[kebabCase(binding)] = `props.${binding}`
if (component.bindings[binding].includes('@')){
// @ts-ignore
bindings[kebabCase(binding)] = this.props[binding];
} else {
bindings[kebabCase(binding)] = `props.${binding}`;
}
}
}
return React.createElement(kebabCase(componentName),
Expand All @@ -89,7 +93,7 @@ export function angular2react<Props extends object>(
if (this.state.didInitialCompile || !this.state.scope) {
return
}

let $injector = angular.element(document.querySelectorAll('[ng-app]')[0]).injector();
$injector.get('$compile')(element)(this.state.scope)
this.digest()
this.setState({ didInitialCompile: true })
Expand Down