Rename hybridView/hybridExec to isomorphicView/isomorphicExec

Author: zaaack

Samples/SSRSample/src/Client/View.fs

@@ -163,7 +163,7 @@ let view (model: Model) (dispatch) =
 
       div [] [
         span [] [ str "Test js component:" ]
-        hybridView jsComp jsCompServer { text="I'm rendered by a js Component!" }
+        isomorphicView jsComp jsCompServer { text="I'm rendered by a js Component!" }
       ]
 
       div [] [

src/Fable.React/Fable.Helpers.Isomorphic.fs

@@ -33,10 +33,10 @@ open Fable.Helpers.React
 
 /// Isomorphic helper function for conditional executaion
 /// it will execute `clientFn model` in the client side and `serverFn model` in the server side
-let inline hybridExec clientFn serverFn model =
-    ServerRenderingInternal.hybridExec clientFn serverFn model
+let inline isomorphicExec clientFn serverFn model =
+    ServerRenderingInternal.isomorphicExec clientFn serverFn model
 
-let hybridView (clientView: 'model -> ReactElement) (serverView: 'model -> ReactElement) (model: 'model) =
+let isomorphicView (clientView: 'model -> ReactElement) (serverView: 'model -> ReactElement) (model: 'model) =
 #if FABLE_COMPILER
     ofType<HybridComponent<_>, _, _> { clientView=clientView; serverView=serverView; model=model } []
 #else

src/Fable.React/Fable.Helpers.React.fs

@@ -769,7 +769,7 @@ type ServerElementType =
 let [<Literal>] private ChildrenName = "children"
 
 module ServerRenderingInternal =
-    let inline hybridExec  (clientFn: 'a -> 'b) (serverFn: 'a -> 'b) (input: 'a) =
+    let inline isomorphicExec  (clientFn: 'a -> 'b) (serverFn: 'a -> 'b) (input: 'a) =
 #if FABLE_COMPILER
         clientFn input
 #else
@@ -829,7 +829,7 @@ let inline ofType<'T,[<Pojo>]'P,[<Pojo>]'S when 'T :> Component<'P,'S>> (props:
     let inline serverRender () =
         createServerElement(typeof<'T>, props, children, ServerElementType.Component)
 
-    hybridExec clientRender serverRender ()
+    isomorphicExec clientRender serverRender ()
 
 
 
@@ -845,7 +845,7 @@ let inline com<'T,[<Pojo>]'P,[<Pojo>]'S when 'T :> Component<'P,'S>> (props: 'P)
 /// ofFunction Hello { name = "Maxime" } []
 /// ```
 let inline ofFunction<[<Pojo>]'P> (f: 'P -> ReactElement) (props: 'P) (children: ReactElement list): ReactElement =
-    hybridExec createElement createServerElementByFn (f, props, children)
+    isomorphicExec createElement createServerElementByFn (f, props, children)
 
 
 /// OBSOLETE: Use `ofFunction`
@@ -923,7 +923,7 @@ let inline domEl (tag: string) (props: IHTMLProp list) (children: ReactElement l
     let inline serverRender (tag, props, children) =
         createServerElement(tag, (props |> Seq.cast<IProp>), children, ServerElementType.Tag)
 
-    hybridExec clientRender serverRender (tag, props, children)
+    isomorphicExec clientRender serverRender (tag, props, children)
 
 /// Instantiate a DOM React element (void)
 let inline voidEl (tag: string) (props: IHTMLProp list) : ReactElement =
@@ -933,7 +933,7 @@ let inline voidEl (tag: string) (props: IHTMLProp list) : ReactElement =
     let inline serverRender (tag, props, children) =
         createServerElement(tag, (props |> Seq.cast<IProp>), children, ServerElementType.Tag)
 
-    hybridExec clientRender serverRender (tag, props, [])
+    isomorphicExec clientRender serverRender (tag, props, [])
 
 /// Instantiate an SVG React element
 let inline svgEl (tag: string) (props: IProp list) (children: ReactElement list): ReactElement =
@@ -942,7 +942,7 @@ let inline svgEl (tag: string) (props: IProp list) (children: ReactElement list)
     let inline serverRender (tag, props, children) =
         createServerElement(tag, (props |> Seq.cast<IProp>), children, ServerElementType.Tag)
 
-    hybridExec clientRender serverRender (tag, props, children)
+    isomorphicExec clientRender serverRender (tag, props, children)
 
 /// Instantiate a React fragment
 let inline fragment (props: IFragmentProp list) (children: ReactElement list): ReactElement =
@@ -951,7 +951,7 @@ let inline fragment (props: IFragmentProp list) (children: ReactElement list): R
     let inline serverRender () =
         createServerElement(typedefof<Fragment>, (props |> Seq.cast<IProp>), children, ServerElementType.Fragment)
 
-    hybridExec clientRender serverRender ()
+    isomorphicExec clientRender serverRender ()
 
 // Standard elements
 let inline a b c = domEl "a" b c

src/Fable.React/Fable.Helpers.ReactServer.fs

@@ -11,6 +11,7 @@ open Fable.Helpers.React.Props
 // Adapted from https://github.com/emotion-js/emotion/blob/182e34bab2b2028c96d513b67ed86faee1b642b2/packages/emotion-utils/src/index.js#L13
 let private unitlessCssProps = set [ "animation-iteration-count"; "border-image-outset"; "border-image-slice"; "border-image-width"; "box-flex"; "box-flex-group"; "box-ordinal-group"; "column-count"; "columns"; "flex"; "flex-grow"; "flex-positive"; "flex-shrink"; "flex-negative"; "flex-order"; "grid-row"; "grid-row-end"; "grid-row-span"; "grid-row-start"; "grid-column"; "grid-column-end"; "grid-column-span"; "grid-column-start"; "font-weight"; "line-height"; "opacity"; "order"; "orphans"; "tab-size"; "widows"; "z-index"; "zoom"; "-webkit-line-clamp"; "fill-opacity"; "flood-opacity"; "stop-opacity"; "stroke-dasharray"; "stroke-dashoffset"; "stroke-miterlimit"; "stroke-opacity"; "stroke-width" ]
 
+// Adapted from https://github.com/facebook/react/blob/37e4329bc81def4695211d6e3795a654ef4d84f5/packages/react-dom/src/server/escapeTextForBrowser.js#L49
 let escapeHtml (str: string) =
   let escaped = StringBuilder()
   let splits = str.Split('"', '\'', '&', '<', '>')